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-29654: [release-4.15] Disable network-node-identity on ROKS #2278

Merged
merged 2 commits into from Feb 28, 2024
Merged

OCPBUGS-29654: [release-4.15] Disable network-node-identity on ROKS #2278

merged 2 commits into from Feb 28, 2024

Conversation

kyrtapz
Copy link
Contributor

@kyrtapz kyrtapz commented Feb 19, 2024

Cherry-pick of #2197
There were some conflicts in the second commit because the original change was not yet backported.

@kyrtapz
Disable network-node-identity on ROKS
8283f85 
In environments with external control plane topology, the API server is deployed out of cluster.
This means that CNO cannot easily predict how to deploy and enforce the node identity webhook.
IBMCloud uses an external control plane topology with Calico as the CNI for both HyperShift based
ROKS deployments and IBM ROKS Toolkit based ROKS deployments. There is no signifficant value
added by the network-node-identity in this scenario.

Signed-off-by: Patryk Diak <pdiak@redhat.com>
(cherry picked from commit ad94f41)
@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 19, 2024

/jira cherry-pick OCPBUGS-24690

@openshift-ci-robot
Copy link
Contributor

@kyrtapz: Jira Issue OCPBUGS-24690 has been cloned as Jira Issue OCPBUGS-29654. Will retitle bug to link to clone.
/retitle OCPBUGS-29654: [release-4.15] Disable network-node-identity on ROKS

In response to this:

/jira cherry-pick OCPBUGS-24690

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title [release-4.15] Disable network-node-identity on ROKS OCPBUGS-29654: [release-4.15] Disable network-node-identity on ROKS Feb 19, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Feb 19, 2024
@openshift-ci-robot
Copy link
Contributor

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-24690 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-24690 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

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

In response to this:

Cherry-pick of #2197
There were some conflicts in the second commit because the original change was not yet backported.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 19, 2024
@kyrtapz
getMultusAdmissionControllerReplicas for non-hypershift externalTopol…
4193961 
…ogy clusters

a5edddf introduced a change that doesn't work on
non-hypershift clusters with external controllplane. Re-introduce the original
logic for this type of clusters.

Signed-off-by: Patryk Diak <pdiak@redhat.com>
(cherry picked from commit 21a564c)
Signed-off-by: Patryk Diak <pdiak@redhat.com>
@Joseph-Goergen
Copy link
Contributor

@kyrtapz Any chance we can also get this backported to 4.14?

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 21, 2024

@kyrtapz Any chance we can also get this backported to 4.14?

Yup, once this PR merges I will open a 4.14 backport

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 21, 2024

/retest
/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link

@kyrtapz: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/retest
/cherry-pick release-4.14

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.

@Joseph-Goergen
Copy link
Contributor

/retest

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 24, 2024

@kyrtapz: 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-dualstack-primaryv6 4193961 link false /test e2e-vsphere-ovn-dualstack-primaryv6
ci/prow/security 4193961 link false /test security

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.

@dougbtv
Copy link
Member

dougbtv commented Feb 27, 2024

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Feb 27, 2024
@dougbtv
Copy link
Member

dougbtv commented Feb 27, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 27, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dougbtv, kyrtapz

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

@weliang1
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 27, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 038cbcf into openshift:release-4.15 Feb 28, 2024
40 of 42 checks passed
@openshift-ci-robot
Copy link
Contributor

@kyrtapz: Jira Issue OCPBUGS-29654: All pull requests linked via external trackers have merged:

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

In response to this:

Cherry-pick of #2197
There were some conflicts in the second commit because the original change was not yet backported.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot
Copy link

@kyrtapz: #2278 failed to apply on top of branch "release-4.14":

Applying: Disable network-node-identity on ROKS
Applying: getMultusAdmissionControllerReplicas for non-hypershift externalTopology clusters
Using index info to reconstruct a base tree...
M	pkg/network/multus_admission_controller.go
M	pkg/network/render.go
M	pkg/network/render_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/network/render_test.go
Auto-merging pkg/network/render.go
Auto-merging pkg/network/multus_admission_controller.go
CONFLICT (content): Merge conflict in pkg/network/multus_admission_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 getMultusAdmissionControllerReplicas for non-hypershift externalTopology clusters
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:

/retest
/cherry-pick release-4.14

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-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-network-operator-container-v4.15.0-202402280108.p0.g038cbcf.assembly.stream.el9 for distgit cluster-network-operator.
All builds following this will include this PR.

@kyrtapz kyrtapz mentioned this pull request Feb 28, 2024
Merged
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2024-02-29-161507

@openshift-ci-robot openshift-ci-robot mentioned this pull request Apr 5, 2024
Merged
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

@JacobTanenbaum JacobTanenbaum Awaiting requested review from JacobTanenbaum

Assignees

@mffiedler mffiedler

@rbbratta rbbratta

@eurijon eurijon

@weliang1 weliang1

@anuragthehatter anuragthehatter

@huiran0826 huiran0826

@rlobillo rlobillo

@asood-rh asood-rh

@jechen0648 jechen0648

@qiowang721 qiowang721

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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