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.

Sign up for GitHub

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

Jump to bottom

OCPBUGS-11534:Stack migration #1643

Merged
merged 2 commits into from Apr 18, 2023
Merged

OCPBUGS-11534:Stack migration #1643

merged 2 commits into from Apr 18, 2023

Conversation

bpickard22
Copy link
Contributor

@dcbw @bpickard22
Small cleanups to log messages and test suite name
eb4e2af 
Fix the formatting of the log messages (%w is only valid when
creating new errors, not when logging) and update the master
test suite name since it hasn't been only gateway init operations
for a long time.

Signed-off-by: Dan Williams <dcbw@redhat.com>
(cherry picked from commit b14eb72)
@dcbw @bpickard22
clustermanager: update node annotations on dual->single stack convers…
f05c0cf 
…tion

Remove the no-longer-used node host subnet annotation to allow the
default network controller's node code to proceed.

Also redo how the default network controller counts host subnets
to make sure we actually have the right number of each IP family,
rather than just counting numbers. Because the allocation handling
was split out into the ClusterManager, the network controller's
addNode() no longer has the guarantees of a correct set of annotations
before it runs, as it and the cluster manager run in parallel.

Signed-off-by: Dan Williams <dcbw@redhat.com>
(cherry picked from commit 0c79228)
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 17, 2023
@openshift-ci-robot
Copy link
Contributor

@bpickard22: This pull request references Jira Issue OCPBUGS-11534, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Clean backport of ovn-org/ovn-kubernetes#3524
@dcbw

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.

@bpickard22
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 17, 2023
@openshift-ci-robot
Copy link
Contributor

@bpickard22: This pull request references Jira Issue OCPBUGS-11534, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @anuragthehatter

In response to this:

/jira refresh

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.

@zshi-redhat
Copy link
Contributor

/retest-required

1 similar comment
@zshi-redhat
Copy link
Contributor

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 18, 2023 •
edited

@bpickard22: 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-aws-ovn-hypershift f05c0cf link false /test e2e-aws-ovn-hypershift
ci/prow/e2e-azure-ovn f05c0cf link false /test e2e-azure-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.

@jcaamano
Copy link
Contributor

/approve
/lgtm

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

openshift-ci bot commented Apr 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bpickard22, jcaamano

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 Apr 18, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 04fcf6c and 2 for PR HEAD f05c0cf in total

@openshift-merge-robot openshift-merge-robot merged commit 3649fe0 into openshift:master Apr 18, 2023
25 of 27 checks passed
@openshift-ci-robot
Copy link
Contributor

@bpickard22: Jira Issue OCPBUGS-11534: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-11534 has been moved to the MODIFIED state.

In response to this:

Clean backport of ovn-org/ovn-kubernetes#3524
@dcbw

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.

@trozet
Copy link
Contributor

trozet commented Apr 19, 2023

/cherry-pick release-4.13

@openshift-cherrypick-robot
Copy link

@trozet: #1643 failed to apply on top of branch "release-4.13":

Applying: Small cleanups to log messages and test suite name
Applying: clustermanager: update node annotations on dual->single stack converstion
Using index info to reconstruct a base tree...
M	go-controller/pkg/clustermanager/network_cluster_controller.go
Falling back to patching base and 3-way merge...
Auto-merging go-controller/pkg/clustermanager/network_cluster_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/clustermanager/network_cluster_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 clustermanager: update node annotations on dual->single stack converstion
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.13

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 mentioned this pull request Apr 25, 2023
Merged
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.13.0-0.nightly-2023-04-27-232707

tssurya added a commit to tssurya/ovn-kubernetes-1 that referenced this pull request May 18, 2023
@tssurya
Merge remote-tracking branch 'ovnorg/master' into ovn-ic-scale-ds-merge
d6af650 
Conflicts:
	go-controller/pkg/clustermanager/network_cluster_controller.go
	go-controller/pkg/clustermanager/network_cluster_controller_test.go
because openshift#1643 went in
	go-controller/pkg/libovsdb/libovsdb.go
because openshift#1652 went in
	go-controller/pkg/ovn/controller/services/lb_config.go
because we have to take care of ETP=local OCPHACK:
openshift#1622
	go-controller/pkg/ovn/controller/services/loadbalancer.go
because openshift#1652 went in
	go-controller/pkg/ovn/master.go
	go-controller/pkg/ovn/master_test.go
because openshift#1643 went in
tssurya added a commit to tssurya/ovn-kubernetes-1 that referenced this pull request May 19, 2023
@tssurya
Merge remote-tracking branch 'ovnorg/master' into downstream-merge-ic…
fbc9ce5 
…-scale

Conflicts:
	go-controller/pkg/clustermanager/network_cluster_controller.go
	go-controller/pkg/clustermanager/network_cluster_controller_test.go
because openshift#1643 went in
	go-controller/pkg/libovsdb/libovsdb.go
because openshift#1652 went in
	go-controller/pkg/node/healthcheck_service.go
because openshift#1671 went in
	go-controller/pkg/ovn/controller/services/lb_config.go
because we have to take care of ETP=local OCPHACK:
openshift#1622
	go-controller/pkg/ovn/controller/services/loadbalancer.go
because openshift#1652 went in
	go-controller/pkg/ovn/master.go
	go-controller/pkg/ovn/master_test.go
because openshift#1643 went in
tssurya added a commit to tssurya/ovn-kubernetes-1 that referenced this pull request May 31, 2023
@tssurya
Merge remote-tracking branch 'ovn-org/master' into downstream-merge-3…
9a584ce 
…1st-may-2023

Conflicts:
	go-controller/pkg/clustermanager/network_cluster_controller.go
	go-controller/pkg/clustermanager/network_cluster_controller_test.go
because openshift#1643 went in
	go-controller/pkg/libovsdb/libovsdb.go
because openshift#1652 went in
	go-controller/pkg/node/healthcheck_service.go
because openshift#1671 went in
	go-controller/pkg/ovn/master.go
	go-controller/pkg/ovn/master_test.go
because because openshift#1643 went in
@tssurya tssurya mentioned this pull request May 31, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anuragthehatter anuragthehatter Awaiting requested review from anuragthehatter

@abhat abhat Awaiting requested review from abhat

@trozet trozet Awaiting requested review from trozet

Assignees

@jcaamano jcaamano

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@bpickard22 @openshift-ci-robot @zshi-redhat @jcaamano @trozet @openshift-cherrypick-robot @openshift-merge-robot @dcbw