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-24690: Disable network-node-identity on ROKS #2197

Merged
merged 2 commits into from
Feb 19, 2024
Merged

OCPBUGS-24690: Disable network-node-identity on ROKS #2197

merged 2 commits into from
Feb 19, 2024

Conversation

kyrtapz
Copy link
Contributor

@kyrtapz kyrtapz commented Jan 12, 2024 •
edited

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.
/cc @dougbtv @s1061123

@openshift-ci-robot openshift-ci-robot added 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 Jan 12, 2024
@openshift-ci openshift-ci bot requested a review from dougbtv January 12, 2024 10:48
@openshift-ci-robot
Copy link
Contributor

@kyrtapz: This pull request references Jira Issue OCPBUGS-24690, which is invalid:

  • expected the bug to target the "4.16.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:

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.
In practice, this affects ROKS(IBMCloud) which uses an external control plane topology.

/cc @dougbtv @s1061123

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 requested a review from s1061123 January 12, 2024 10:48
@kyrtapz
Copy link
Contributor Author

kyrtapz commented Jan 12, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jan 12, 2024
@openshift-ci-robot
Copy link
Contributor

@kyrtapz: This pull request references Jira Issue OCPBUGS-24690, 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.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

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

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jan 12, 2024
@kyrtapz
Copy link
Contributor Author

kyrtapz commented Jan 18, 2024

/retest

@s1061123
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2024
@dougbtv
Copy link
Member

dougbtv commented Jan 19, 2024

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 19, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD e53cc19 and 2 for PR HEAD 0421ad9 in total

rtheis
rtheis suggested changes Jan 19, 2024
View reviewed changes
Copy link

@rtheis rtheis left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/hold we need to talk about ROKS since the component is deployed and I'm not sure why we wouldn't want it to be deployed.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 19, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 31, 2024
@kyrtapz
Disable network-node-identity on ROKS
ad94f41 
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>
@openshift-ci-robot
Copy link
Contributor

@kyrtapz: This pull request references Jira Issue OCPBUGS-24690, which is valid.

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

In response to this:

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.
/cc @dougbtv @s1061123

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.

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 5, 2024

/retest

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 5, 2024

/test images

@tssurya
Copy link
Contributor

tssurya commented Feb 6, 2024

/retest-required

@kyrtapz
getMultusAdmissionControllerReplicas for non-hypershift externalTopol…
21a564c 
…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>
@Joseph-Goergen
Copy link
Contributor

/retest

rtheis
rtheis approved these changes Feb 14, 2024
View reviewed changes
Copy link

@rtheis rtheis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/remove-hold
/lgtm

Thanks for being patient and working with us on these changes.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 14, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 14, 2024

@rtheis: changing LGTM is restricted to collaborators

In response to this:

/remove-hold
/lgtm

Thanks for being patient and working with us on these changes.

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.

@s1061123
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Feb 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 15, 2024

/cherry-pick release-4.15

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.15

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

/retest-required

Remaining retests: 0 against base HEAD 7c7c54d and 2 for PR HEAD 21a564c in total

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 16, 2024

/retest-required

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 16, 2024 •
edited

@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 21a564c link false /test e2e-vsphere-ovn-dualstack-primaryv6
ci/prow/security 21a564c link false /test security
ci/prow/e2e-vsphere-ovn 21a564c link false /test e2e-vsphere-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.

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 16, 2024

/retest-required

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 19, 2024

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Feb 19, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit c8debd9 into openshift:master Feb 19, 2024
39 of 42 checks passed
@openshift-ci-robot
Copy link
Contributor

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

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

In response to this:

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.
/cc @dougbtv @s1061123

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: #2197 failed to apply on top of branch "release-4.15":

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/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
CONFLICT (content): Merge conflict in pkg/network/render.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:

/cherry-pick release-4.15

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.

@kyrtapz kyrtapz mentioned this pull request Feb 19, 2024
Merged
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

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

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-02-22-021321

@openshift-ci-robot openshift-ci-robot mentioned this pull request Mar 25, 2024
Merged
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-03-28-223620

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@s1061123 s1061123 s1061123 approved these changes

@rtheis rtheis rtheis approved these changes

@dougbtv dougbtv Awaiting requested review from dougbtv

Assignees

@s1061123 s1061123

Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
10 participants
@kyrtapz @openshift-ci-robot @s1061123 @dougbtv @tssurya @Joseph-Goergen @openshift-cherrypick-robot @openshift-bot @openshift-merge-robot @rtheis