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

OCPBUGS-5825: Removes legacy cloud-provider resources #778

Merged

Conversation

theobarberbany
Copy link
Contributor

This change removes the cloud-provider ClusterRole, ClusterRoleBinding and ServiceAccount that are no longer required from 4.16

@theobarberbany theobarberbany changed the title Removes legacy cloud-provider resources [OCPBUGS-5825] - Removes legacy cloud-provider resources Dec 14, 2023
@theobarberbany theobarberbany changed the title [OCPBUGS-5825] - Removes legacy cloud-provider resources OCPBUGS-5825: Removes legacy cloud-provider resources Dec 14, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Dec 14, 2023
@openshift-ci-robot
Copy link

@theobarberbany: This pull request references Jira Issue OCPBUGS-5825, 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:

This change removes the cloud-provider ClusterRole, ClusterRoleBinding and ServiceAccount that are no longer required from 4.16

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 openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Dec 14, 2023
@JoelSpeed
Copy link
Contributor

Code change looks ok, should verify that both install and upgrade jobs do not have these resources in their must-gathers once the CI runs complete

@theobarberbany
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 14, 2023
@openshift-ci-robot
Copy link

@theobarberbany: This pull request references Jira Issue OCPBUGS-5825, 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)

Requesting review from QA contact:
/cc @zhouying7780

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 kubernetes/test-infra repository.

@ingvagabund
Copy link
Member

/approve
/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 14, 2023
Copy link
Member

@atiratree atiratree left a comment

Choose a reason for hiding this comment

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

@theobarberbany thx for the PR, but there are a few changes required

[]string{
"assets/kube-controller-manager/gce/cloud-provider-role.yaml",
"assets/kube-controller-manager/gce/cloud-provider-binding.yaml",
"assets/kube-controller-manager/sa.yaml",
Copy link
Member

Choose a reason for hiding this comment

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

this sa should be kept. I think the sa for cloud-provider comes from kube

Copy link
Member

Choose a reason for hiding this comment

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

I missed this one. Thanks for noticing it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the review @atiratree :)

I think the sa for cloud-provider comes from kube

Does this mean there's a SA somewhere else I need to remove?

Copy link
Member

Choose a reason for hiding this comment

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

I think the SA should be created automatically when the controller runs

https://github.com/kubernetes/kubernetes/blob/a3adc759a3c096accafb1694f77362ee5f957a22/staging/src/k8s.io/legacy-cloud-providers/gce/gce.go#L652

so, no action required

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks! :)

).WithConditionalResources(
bindata.Asset,
[]string{
"assets/kube-controller-manager/gce/cloud-provider-role.yaml",
Copy link
Member

@atiratree atiratree Dec 14, 2023

Choose a reason for hiding this comment

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

please remove these two files from the main list above

return false
},
func() bool {
// The resources above are required for the 4.14 -> 4.15 upgrade path.
Copy link
Member

Choose a reason for hiding this comment

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

are you planning to backport this to 4.15 branch?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, this would break 4.14 to 4.15 upgrades, that's why we are doing this now. The file needs to be removed only once the upgrade to 4.15 is complete, it cannot be removed mid update as that could cause KCM to fall over and halt the upgrade.

Copy link
Member

Choose a reason for hiding this comment

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

I mean, 4.15 is not released yet, so I think it could still work if we do it before the release.

Copy link
Member

Choose a reason for hiding this comment

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

^ if the RBAC is not used in the 4.14

Copy link
Contributor

Choose a reason for hiding this comment

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

I've been working on the basis that RBAC is used in 4.14, that's why we are removing now, but I will double check when we stopped using it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep, confirmed, RBAC is used in 4.14, not used in 4.15, so I want to remove only from 4.16 to avoid breaking upgrades

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for looking into this. Ok let's remove this in 4.16 then.

@atiratree
Copy link
Member

/lgtm cancel

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 14, 2023
This change removes the cloud-provider ClusterRole, ClusterRoleBinding
and ServiceAccount that are no longer required from 4.16
Copy link
Contributor

openshift-ci bot commented Dec 14, 2023

@theobarberbany: 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/security 2a7520b 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.

@JoelSpeed
Copy link
Contributor

I'm good with this if @atiratree is, but note, do not want to backport to avoid potential breaking of upgrades

@atiratree
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 14, 2023
Copy link
Contributor

openshift-ci bot commented Dec 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: atiratree, ingvagabund, theobarberbany

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:
  • OWNERS [atiratree,ingvagabund]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit b033b8e into openshift:master Dec 14, 2023
9 of 10 checks passed
@openshift-ci-robot
Copy link

@theobarberbany: Jira Issue OCPBUGS-5825: All pull requests linked via external trackers have merged:

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

In response to this:

This change removes the cloud-provider ClusterRole, ClusterRoleBinding and ServiceAccount that are no longer required from 4.16

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 ose-cluster-kube-controller-manager-operator-container-v4.16.0-202312142332.p0.gb033b8e.assembly.stream for distgit ose-cluster-kube-controller-manager-operator.
All builds following this will include this PR.

theobarberbany added a commit to theobarberbany/cluster-cloud-controller-manager-operator that referenced this pull request Dec 18, 2023
This change adds back the ClusterRole and ClusterRoleBinding removed in
[OCPBUGS-5825](openshift/cluster-kube-controller-manager-operator#778).

This is because it is still required at present.
theobarberbany added a commit to theobarberbany/cluster-cloud-controller-manager-operator that referenced this pull request Dec 18, 2023
This change adds back the ClusterRole and ClusterRoleBinding removed in
[OCPBUGS-5825](openshift/cluster-kube-controller-manager-operator#778).

This is because it is still required at present.
theobarberbany added a commit to theobarberbany/cluster-cloud-controller-manager-operator that referenced this pull request Dec 18, 2023
This change adds back the ClusterRole and ClusterRoleBinding removed in
[OCPBUGS-5825](openshift/cluster-kube-controller-manager-operator#778).

This is because it is still required at present.
theobarberbany added a commit to theobarberbany/cluster-cloud-controller-manager-operator that referenced this pull request Dec 18, 2023
This change adds back the ClusterRole and ClusterRoleBinding removed in
[OCPBUGS-5825](openshift/cluster-kube-controller-manager-operator#778).

This is because it is still required at present.
theobarberbany added a commit to theobarberbany/cluster-cloud-controller-manager-operator that referenced this pull request Dec 18, 2023
This change adds back the ClusterRole and ClusterRoleBinding removed in
[OCPBUGS-5825](openshift/cluster-kube-controller-manager-operator#778).

This is because it is still required at present.
theobarberbany added a commit to theobarberbany/cluster-cloud-controller-manager-operator that referenced this pull request Jan 5, 2024
This change adds back the ClusterRole and ClusterRoleBinding removed in
[OCPBUGS-5825](openshift/cluster-kube-controller-manager-operator#778).

This is because it is still required at present.
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. jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. 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
Development

Successfully merging this pull request may close these issues.

None yet

6 participants