Skip to content

Remove image list cm and edb config secret during migration #2448

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
ibm-ci-bot merged 7 commits into from
Mar 19, 2025
Merged

Remove image list cm and edb config secret during migration #2448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29a23ba
update migration job to cleanup certain edb config resources to preve…
bluzarraga Mar 19, 2025
6676222
differentiate operator namespace role
bluzarraga Mar 19, 2025
0779bee
differentiate operator namespace role
bluzarraga Mar 19, 2025
e636beb
differentiate operator namespace role
bluzarraga Mar 19, 2025
5fca424
add secrets to role
bluzarraga Mar 19, 2025
1c35403
remove delete configmap
bluzarraga Mar 19, 2025
080c1ac
do not delete edb secret
bluzarraga Mar 19, 2025
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 bedrock-migration/templates/adopt-cs-cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#not sure this is necessary
apiVersion: operator.ibm.com/v3
kind: CommonService
metadata:
Expand Down
3 changes: 3 additions & 0 deletions bedrock-migration/templates/bedrock-migration-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ spec:
oc delete --ignore-not-found csv $edbCSV -n $operatorNamespace && oc delete --ignore-not-found subscription.operators.coreos.com $edbSub -n $operatorNamespace
fi

echo "Deleting EDB config resources in namespace $operatorNamespace to be regenerated after migration..."
oc delete configmap cloud-native-postgresql-image-list --ignore-not-found -n $operatorNamespace

echo "Deleting IM, UI, and EDB ServiceAccounts and Jobs in operator namespace $operatorNamespace and services namespace $servicesNamespace..."
oc delete --ignore-not-found sa postgresql-operator-manager edb-license-sa -n $operatorNamespace
oc delete --ignore-not-found sa ibm-iam-operand-restricted ibm-commonui-operand common-service-db -n $servicesNamespace
Expand Down
7 changes: 4 additions & 3 deletions bedrock-migration/templates/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: bedrock-migration-job-role
name: bedrock-migration-job-role-{{ .Values.global.operatorNamespace }}
namespace: {{ .Values.global.operatorNamespace }}
annotations:
"helm.sh/hook": pre-install
Expand Down Expand Up @@ -39,6 +39,7 @@ rules:
resources:
- configmaps
- serviceaccounts
- secrets
verbs:
- list
- get
Expand All @@ -64,7 +65,7 @@ rules:
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: bedrock-migration-job-rb
name: bedrock-migration-job-rb-{{ .Values.global.operatorNamespace }}
namespace: {{ .Values.global.operatorNamespace }}
annotations:
"helm.sh/hook": pre-install
Expand All @@ -76,7 +77,7 @@ subjects:
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: bedrock-migration-job-role
name: bedrock-migration-job-role-{{ .Values.global.operatorNamespace }}
{{- $watchNamespaces := .Values.global.tetheredNamespaces | default list -}}
{{- if .Values.global.instanceNamespace -}}
{{- $watchNamespaces = append $watchNamespaces .Values.global.instanceNamespace -}}
Expand Down
Loading