Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SDN-3993: [DownstreamMerge] 06 jul 23 #1742

Merged

Conversation

flavio-fernandes
Copy link
Contributor

no conflicts.

based off of #1729

girishmg and others added 19 commits June 29, 2023 13:10
…ing/adding a pod from routeInfo and add unit tests

Signed-off-by: jordigilh <[email protected]>
This commit adds the notion of zone to the
EgressQoS controller so that it stops processing
remote nodes and pods.

Signed-off-by: Surya Seetharaman <[email protected]>
rename incorrectly named test files - suit_test.go
This commit renames the subsystem from `master`
to `ovnkube-controller`

Signed-off-by: Surya Seetharaman <[email protected]>
…air_end

Wait for APB controller's clean external gateway ECMP routes before resuming default net controller startup
EQoS: Consider only local nodes and pods
…_deleting_pod_in_egressgw

Add check for overlapping external gateway IPs in egressgw when deleting a pod
…n_master_controller

APB: Change hybrid route and SNAT calls in unit tests to call the APB functions instead of the ones exposed for the legacy egressgw
When node from a remote zone is updated, we only perform the
actual update when necessary. This commit improved the logic
for doing the remote update in cases where the subnets of the
remote node change. That is particularly needed when node
changes from ipv4 to dual stack (ipv4 + ipv6)

Reported-at: https://issues.redhat.com/browse/SDN-3993
Signed-off-by: Flavio Fernandes <[email protected]>
There are specific reasons for when we want
to use the structured logs a.k.a InfoS versus
when we want to use the formatted logs a.k.a Infof.

Most of these logs are using the Infof format while
using the InfoS function unfortunately. This causes
logs like:

I0629 20:41:28.798703  114685 master_controller.go:200] "Repairing Admin Policy Based External Route Services"
I0629 20:41:28.798985  114685 repair.go:30] "Syncing exgw routes took %v" 265.415µs="(MISSING)"
I0629 20:41:28.799084  114685 external_controller_pod.go:42] "Processing gateway pod %s/%s with matching policies %+v" openshift-dns="node-resolver-cmhvr" []="(MISSING)"
I0629 20:41:28.799116  114685 external_controller_pod.go:42] "Processing gateway pod %s/%s with matching policies %+v" openshift-etcd="installer-7-ip-10-0-156-153.us-east-2.compute.internal" []="(MISSING)"
I0629 20:41:28.799137  114685 external_controller_pod.go:42] "Processing gateway pod %s/%s with matching policies %+v" openshift-etcd="revision-pruner-7-ip-10-0-144-208.us-east-2.compute.internal" []="(MISSING)"
I0629 20:41:28.799152  114685 external_controller_pod.go:42] "Processing gateway pod %s/%s with matching policies %+v" openshift-kube-apiserver="installer-8-ip-10-0-224-168.us-east-2.compute.internal" []="(MISSING)"
I0629 20:41:28.799170  114685 external_controller_pod.go:42] "Processing gateway pod %s/%s with matching policies %+v" openshift-oauth-apiserver="apiserver-669859c5fb-7m7q6" []="(MISSING)"

Let's change it back to Infof in places where
the key=value format is not used.

Signed-off-by: Surya Seetharaman <[email protected]>
Disable UTs for APB Temporarily till the feature
is stabilized.

Reason: UTs are very flaky. Each PR is needed a
minimum of 3 close/open combinations and luck for CI
to pass to even run e2e's. At this stage where other
features are trying to get in before the deadline this
process is painful.

Signed-off-by: Surya Seetharaman <[email protected]>
At ovnkube-controller start up, it may attempt to start adding resources
for a node that does not yet have its annotation, but should be
considered local. This is especially the case in OpenShift when going
from phase1 -> phase 2 upgrade and ovnkube-node on the node will
annotate its zone id. In this case ovnkube-controller will start too
early and program NBDB resources as remote for the node. Then when the
node is annotated, it will program NBDB resources as local.

Since we cannot be sure that all remote feature configuration in NBDB is
removed when going from remote -> local we need to avoid this case. It
also makes no sense to program NBDB when there are no nodes in the zone.

This commit adds a wait to make sure at least one node in the cluster
is in the ovnkube-controller's managed zone.

Thanks @numansiddique for the idea.

Signed-off-by: Tim Rozet <[email protected]>
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jul 6, 2023

@flavio-fernandes: This pull request references SDN-3993 which is a valid jira issue.

In response to this:

no conflicts.

based off of #1729

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 6, 2023
@openshift-ci openshift-ci bot requested review from jcaamano and tssurya July 6, 2023 16:44
@flavio-fernandes
Copy link
Contributor Author

/assign @trozet @jordigilh @npinaeva @tssurya

@npinaeva
Copy link
Member

npinaeva commented Jul 7, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 7, 2023
@dcbw
Copy link
Contributor

dcbw commented Jul 7, 2023

/retest

@dcbw
Copy link
Contributor

dcbw commented Jul 7, 2023

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dcbw, flavio-fernandes, npinaeva

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 7, 2023
@dcbw
Copy link
Contributor

dcbw commented Jul 7, 2023

/override ci/prow/e2e-metal-ipi-ovn-dualstack
https://redhat-internal.slack.com/archives/CBZHF4DHC/p1688658503124429

@dcbw
Copy link
Contributor

dcbw commented Jul 7, 2023

/override ci/prow/e2e-gcp-ovn
Unrelated and will be fixed by ovn-org/ovn-kubernetes#3751

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 7, 2023

@dcbw: Overrode contexts on behalf of dcbw: ci/prow/e2e-metal-ipi-ovn-dualstack

In response to this:

/override ci/prow/e2e-metal-ipi-ovn-dualstack
https://redhat-internal.slack.com/archives/CBZHF4DHC/p1688658503124429

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 7, 2023

@dcbw: Overrode contexts on behalf of dcbw: ci/prow/e2e-gcp-ovn

In response to this:

/override ci/prow/e2e-gcp-ovn
Unrelated and will be fixed by ovn-org/ovn-kubernetes#3751

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 7, 2023

@flavio-fernandes: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-vsphere-ovn 2f8e12e link false /test e2e-vsphere-ovn
ci/prow/e2e-openstack-ovn 2f8e12e link false /test e2e-openstack-ovn

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit d917250 into openshift:master Jul 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants