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

Update filter logic for finding subnets and security groups due to 4.16 changes #596

Conversation

AlexVulaj
Copy link
Contributor

Resolves OSD-24457.

As of 4.16, some downstream component is causing the subnet tag kubernetes.io/cluster/<infra_id> to show as "shared" instead of "owned" now, even for fresh installs in clean AWS accounts. As far as the network verifier is concerned, we probably don't actually care about the value of this tag, just that it exists.

There was also a regression captured in OCPBUGS-36902 with the kubernetes.io/cluster/<infra_id> tag being removed from security groups. Since the Name tag already includes a unique cluster identifier, I've dropped this tag entirely from the filters to prevent issues with searching.

I verified on a cluster installed at 4.1.z that the Name tag was present with the value that we expect, so I wouldn't expect any issues with this change on older clusters.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 11, 2024
@AlexVulaj AlexVulaj force-pushed the verifier-find-subnet-sg-filters branch 2 times, most recently from ec9fb54 to 468a41a Compare July 12, 2024 14:15
{
Name: aws.String(fmt.Sprintf("tag:kubernetes.io/cluster/%s", e.cluster.InfraID())),
Values: []string{"owned"},
Values: []string{fmt.Sprintf("%s-master-sg", e.cluster.InfraID()), fmt.Sprintf("%s-controlplane", e.cluster.InfraID())},
Copy link
Contributor Author

@AlexVulaj AlexVulaj Jul 12, 2024

Choose a reason for hiding this comment

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

in 4.16 <infra_id>-master-sg => <infra_id>-controlplane. We need to check for both now.

@AlexVulaj
Copy link
Contributor Author

/hold
Still some discussion going on.

@AlexVulaj AlexVulaj force-pushed the verifier-find-subnet-sg-filters branch from 468a41a to beaf5a3 Compare July 12, 2024 14:28
@AlexVulaj
Copy link
Contributor Author

/unhold

Copy link
Member

@clcollins clcollins left a comment

Choose a reason for hiding this comment

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

Minor suggestion for some comments, but otherwise LGTM. Feel free to either add, or not, the comments, and I'll LGTM officially either way.

cmd/network/verification.go Show resolved Hide resolved
cmd/network/verification.go Show resolved Hide resolved
@AlexVulaj
Copy link
Contributor Author

/label tide/merge-method-squash

@openshift-ci openshift-ci bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jul 13, 2024
@AlexVulaj AlexVulaj requested a review from clcollins July 13, 2024 17:05
@AlexVulaj AlexVulaj force-pushed the verifier-find-subnet-sg-filters branch from d92776e to 2b697bb Compare July 15, 2024 13:44
…16 changes.

Co-authored-by: Christopher Collins <collins.christopher@gmail.com>
Co-authored-by: Michael Shen <mishen@umich.edu>
@AlexVulaj AlexVulaj force-pushed the verifier-find-subnet-sg-filters branch from bdb12f0 to df89fb2 Compare July 15, 2024 14:11
Copy link
Contributor

@mjlshen mjlshen left a comment

Choose a reason for hiding this comment

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

/lgtm

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

openshift-ci bot commented Jul 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AlexVulaj, mjlshen

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

Copy link
Contributor

openshift-ci bot commented Jul 15, 2024

@AlexVulaj: all tests passed!

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 8472c35 into openshift:master Jul 15, 2024
5 checks passed
@AlexVulaj AlexVulaj deleted the verifier-find-subnet-sg-filters branch July 15, 2024 14:39
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. lgtm Indicates that a PR is ready to be merged. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants