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

Add disable-infra annotation to hive clusterdeployments #3985

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

tsatam
Copy link
Collaborator

@tsatam tsatam commented Dec 2, 2024

Which issue this PR addresses:

Fixes ARO-11607

What this PR does / why we need it:

Adds the hive.openshift.io/infra-disabled annotation to our Hive ClusterDeployments (for both new installs as well as adopted clusters), set to true. This is required in order to disable the hibernation controller, which does not currently work for ARO MIWI clusters.

Note

This PR currently disables the hibernation controller for all cluster installations (CSP and MIWI) - we do not use this functionality in ARO's implementation of Hive today.

See corresponding change in Hive to add this annotation for more details: openshift/hive#2501

Test plan for issue:

  • E2E test was added to ensure the annotation is set
  • E2E cluster creation ensures the cluster is installed successfully with this annotation set

Is there any documentation that needs to be updated for this PR?

No

How do you know this will function as expected in production?

E2E tests outlined above

@tsatam
Copy link
Collaborator Author

tsatam commented Dec 2, 2024

/azp run ci

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

cadenmarchese
cadenmarchese previously approved these changes Dec 3, 2024
pkg/hive/resources.go Outdated Show resolved Hide resolved
Co-authored-by: Caden Marchese <[email protected]>
@tsatam
Copy link
Collaborator Author

tsatam commented Dec 3, 2024

/azp run ci

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@kimorris27 kimorris27 left a comment

Choose a reason for hiding this comment

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

LGTM. I only left my nit because there's a formatting issue that needs to be fixed anyway.

Annotations: map[string]string{
// https://github.com/openshift/hive/pull/2501
// Disable hibernation controller as it is not used as part of ARO's Hive implementation
"hive.openshift.io/infra-disabled": "true",
Copy link
Contributor

Choose a reason for hiding this comment

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

Super nit: we could make a const for this in pkg/hive since it's used in two places.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants