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

cleanup CCO from ibm-cloud-managed #443

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion manifests/00-clusterreader_clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ metadata:
labels:
rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true"
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
Expand Down
1 change: 0 additions & 1 deletion manifests/00-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
Copy link
Contributor

Choose a reason for hiding this comment

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

@joelddiaz if we're not removing cloud cred requests from all repos before 4.10, then it doesn't make sense to exclude the CRD just yet

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I was thinking we'd block this PR until all the depending PRs merge (which of course means we're looking at this stuff landing for 4.11).

include.release.openshift.io/self-managed-high-availability: "true"
name: credentialsrequests.cloudcredential.openshift.io
spec:
Expand Down
1 change: 0 additions & 1 deletion manifests/00-namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Namespace
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
openshift.io/node-selector: ""
workload.openshift.io/allowed: "management"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ metadata:
name: prometheus-k8s
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ metadata:
name: prometheus-k8s
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ metadata:
name: cloud-credential-operator
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
endpoints:
Expand Down
1 change: 0 additions & 1 deletion manifests/01-cluster-role-binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ metadata:
creationTimestamp: null
name: cloud-credential-operator-rolebinding
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
1 change: 0 additions & 1 deletion manifests/01-cluster-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ metadata:
creationTimestamp: null
name: cloud-credential-operator-role
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
Expand Down
1 change: 0 additions & 1 deletion manifests/01-role-binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ metadata:
name: cloud-credential-operator
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
subjects:
- kind: ServiceAccount
Expand Down
1 change: 0 additions & 1 deletion manifests/01-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ metadata:
name: cloud-credential-operator-role
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
Expand Down
1 change: 0 additions & 1 deletion manifests/01-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
service.alpha.openshift.io/serving-cert-secret-name: cloud-credential-operator-serving-cert
name: cco-metrics
Expand Down
1 change: 0 additions & 1 deletion manifests/01-trusted-ca-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ metadata:
name: cco-trusted-ca
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
1 change: 0 additions & 1 deletion manifests/02-sa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ metadata:
name: cloud-credential-operator
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
127 changes: 127 additions & 0 deletions manifests/ibm-cloud-cleanup.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: system:openshift:cloud-credential-operator:cluster-reader
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
name: credentialsrequests.cloudcredential.openshift.io
---
apiVersion: v1
kind: Namespace
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
name: openshift-cloud-credential-operator
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: prometheus-k8s
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: prometheus-k8s
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: cloud-credential-operator
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
kind: ClusterRoleBinding
metadata:
name: cloud-credential-operator-rolebinding
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: cloud-credential-operator-role
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
apiVersion: operator.openshift.io/v1
kind: CloudCredential
metadata:
name: cluster
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/delete: "true"
---
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: cloud-credential-operator
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: cloud-credential-operator-role
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
apiVersion: v1
kind: Service
Copy link
Contributor

Choose a reason for hiding this comment

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

needs name/namespace

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed. also added an additional Service that may have long ago been part of CCO and is presently marked for deletion (named 'controller-manager-service') but cover it under the ibm-cloud-managed list of things to delete in the event that it was ever installed on that profile.

metadata:
name: controller-manager-service
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
apiVersion: v1
kind: Service
metadata:
name: cco-metrics
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: cco-trusted-ca
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: cloud-credential-operator
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
release.openshift.io/delete: "true"