Skip to content

[release-4.14] OCPBUGS-19357: install: Recreate and delayed default ServiceAccount deletion #3920

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

Merged
openshift-merge-robot merged 1 commit into from
Sep 19, 2023
Merged

[release-4.14] OCPBUGS-19357: install: Recreate and delayed default ServiceAccount deletion #3920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 0 additions & 20 deletions install/0000_80_machine-config-operator_03_rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,3 @@ subjects:
- kind: ServiceAccount
name: prometheus-k8s
namespace: openshift-monitoring
# keep default for upgrading purposes, need to delete the existing role:
# https://github.com/openshift/enhancements/blob/master/dev-guide/cluster-version-operator/dev/object-deletion.md
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: default-account-openshift-machine-config-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/delete: "true"
subjects:
- kind: ServiceAccount
name: default
namespace: openshift-machine-config-operator
roleRef:
kind: ClusterRole
name: cluster-admin
apiGroup: rbac.authorization.k8s.io
2 changes: 2 additions & 0 deletions install/0000_80_machine-config-operator_04_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
selector:
matchLabels:
k8s-app: machine-config-operator
strategy:
type: Recreate
template:
metadata:
labels:
Expand Down
19 changes: 19 additions & 0 deletions install/0000_90_machine-config-operator_90_deletion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# keep default for upgrading purposes, need to delete the existing role:
# https://github.com/openshift/enhancements/blob/master/dev-guide/cluster-version-operator/dev/object-deletion.md
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: default-account-openshift-machine-config-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/delete: "true"
subjects:
- kind: ServiceAccount
name: default
namespace: openshift-machine-config-operator
roleRef:
kind: ClusterRole
name: cluster-admin
apiGroup: rbac.authorization.k8s.io