Skip to content

OCPCLOUD-2514: Remove reliance on feature gates for whether to deploy CCMs #334

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
Merged
merged 2 commits into from
Mar 1, 2024
Merged

OCPCLOUD-2514: Remove reliance on feature gates for whether to deploy CCMs #334

merged 2 commits into from
Mar 1, 2024

Conversation

@JoelSpeed
Copy link
Contributor

@JoelSpeed JoelSpeed commented Feb 28, 2024

We no longer need to observe the cloud provider external feature gates to determine if the CCMs should be applied or not. Now, only the platform type is observed.
This PR cleans up the references I could find to using a feature gate for external cloud provider enablement.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 28, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 28, 2024 •
edited by openshift-ci bot
Loading

@JoelSpeed: This pull request references OCPCLOUD-2514 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

We no longer need to observe the cloud provider external feature gates to determine if the CCMs should be applied or not. Now, only the platform type is observed.
This PR cleans up the references I could find to using a feature gate for external cloud provider enablement.

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 review from RadekManak and damdo February 28, 2024 17:50
elmiko
elmiko reviewed Feb 28, 2024
View reviewed changes
Copy link
Contributor

@elmiko elmiko left a comment

Choose a reason for hiding this comment

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

happy to approve this, just a quick question

pkg/controllers/clusteroperator_controller_test.go Outdated
[]configv1.FeatureGateName{configv1.FeatureGateExternalCloudProvider},
nil,
)
featureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(nil, nil)
Copy link
Contributor

@elmiko elmiko Feb 28, 2024

Choose a reason for hiding this comment

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

just a question, looking at the tests it seems like we can factor out this variable. what am i missing?

Copy link
Contributor Author

@JoelSpeed JoelSpeed Feb 29, 2024

Choose a reason for hiding this comment

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

The clusteroperator still uses a featuregateaccess underneath to render feature gates for the operand resources, so I had left it in, in case we need to update the cases, but, I think you're right, that would probably be tested elsewhere so we maybe don't need it in the test cases here

JoelSpeed
JoelSpeed commented Feb 29, 2024
View reviewed changes
pkg/controllers/clusteroperator_controller_test.go
coStatus: coStatus,
expectProvisioned: false,
}),
Entry("Should provision resources for AWS if external FeatureGate is not present", testCase{
Copy link
Contributor Author

@JoelSpeed JoelSpeed Feb 29, 2024

Choose a reason for hiding this comment

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

This case ended up being identical to another case

Copy link
Contributor

@elmiko elmiko Feb 29, 2024

Choose a reason for hiding this comment

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

yay for cleanup!

elmiko
elmiko reviewed Feb 29, 2024
View reviewed changes
Copy link
Contributor

@elmiko elmiko left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

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

elmiko commented Feb 29, 2024

the e2e errors /seem/ unrelated

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko

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 Feb 29, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 29, 2024

/retest-required

Remaining retests: 0 against base HEAD b06bfa1 and 2 for PR HEAD a292ad6 in total

@elmiko
Copy link
Contributor

elmiko commented Feb 29, 2024

saw this error on the kcmo update as well, not sure what they mean though:

[sig-arch] Managed cluster [It] should ensure pods use downstream images from our release image with proper ImagePullPolicy [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]
  github.com/openshift/origin/test/extended/operators/images.go:22

    [FAILED] unable to decode release payload with error: invalid character 'w' looking for beginning of value

that doesn't seem related to this change

@JoelSpeed
Copy link
Contributor Author

JoelSpeed commented Mar 1, 2024

/retest

@JoelSpeed JoelSpeed mentioned this pull request Mar 1, 2024
Merged
@openshift-merge-bot openshift-merge-bot bot merged commit 2d2016b into openshift:master Mar 1, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 1, 2024

@JoelSpeed: The following test 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 a292ad6 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.

@openshift-bot
Copy link

openshift-bot commented Mar 1, 2024

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-cloud-controller-manager-operator-container-v4.16.0-202403011810.p0.g2d2016b.assembly.stream.el9 for distgit ose-cluster-cloud-controller-manager-operator.
All builds following this will include this PR.

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

Reviewers

@damdo damdo Awaiting requested review from damdo

@RadekManak RadekManak Awaiting requested review from RadekManak

1 more reviewer

@elmiko elmiko elmiko left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@elmiko elmiko

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@JoelSpeed @openshift-ci-robot @elmiko @openshift-bot