From 03eae09e9a9591e978d5b778d1d13ecf23050ba4 Mon Sep 17 00:00:00 2001 From: Tom Klapiscak <7372253+tomklapiscak@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:49:46 +0100 Subject: [PATCH 1/4] [patch] Do not re-enable TLS in DB2DB postsync job (#186) https://jsw.ibm.com/browse/MASCORE-3750 --- .../templates/05-postsync-setup-db2_Job.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/120-ibm-db2u-database/templates/05-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/05-postsync-setup-db2_Job.yaml index bdfddb4bb..520cf3067 100644 --- a/instance-applications/120-ibm-db2u-database/templates/05-postsync-setup-db2_Job.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/05-postsync-setup-db2_Job.yaml @@ -95,7 +95,7 @@ kind: Job metadata: # Suffix the Job name with a hash of all chart values # This is to ensure that ArgoCD will delete and recreate the job if (and only if) anything changes in the DB2 config - name: "postsync-setup-db2-{{ .Values.db2_instance_name }}-v2-{{ .Values | toYaml | adler32sum }}" + name: "postsync-setup-db2-{{ .Values.db2_instance_name }}-v3-{{ .Values | toYaml | adler32sum }}" namespace: "{{ .Values.db2_namespace }}" annotations: argocd.argoproj.io/sync-wave: "129" @@ -470,7 +470,7 @@ spec: [ \$rc -ne 0 ] && exit \$rc echo "backupdb.sh: db2set comms manager" - db2set DB2COMM=TCPIP,SSL + db2set DB2COMM=SSL rc=\$? [ \$rc -ne 0 ] && exit \$rc From 1ba37a3c8909f77f9cd6fa97354b24bf503ee18c Mon Sep 17 00:00:00 2001 From: Tom Klapiscak <7372253+tomklapiscak@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:33:04 +0100 Subject: [PATCH 2/4] [patch] Do not re-enable TLS in DB2DB postsync job (#186) (#187) (#188) From c8868c90a9f83996e748cc229ca8b5db49290809 Mon Sep 17 00:00:00 2001 From: Tom Klapiscak <7372253+tomklapiscak@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:03:28 +0100 Subject: [PATCH 3/4] [patch] Redo Manage Attachment configuration support in SaaS/gitops (#190) https://jsw.ibm.com/browse/MASCORE-3747 --- ...crets.yaml => 01-ibm-manage_encryption_secret.yaml} | 10 +++++++--- .../templates/510-550-ibm-mas-masapp-configs.yaml | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) rename instance-applications/510-550-ibm-mas-suite-app-config/templates/{01-ibm-manage_attachments_secrets.yaml => 01-ibm-manage_encryption_secret.yaml} (51%) diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/01-ibm-manage_attachments_secrets.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/01-ibm-manage_encryption_secret.yaml similarity index 51% rename from instance-applications/510-550-ibm-mas-suite-app-config/templates/01-ibm-manage_attachments_secrets.yaml rename to instance-applications/510-550-ibm-mas-suite-app-config/templates/01-ibm-manage_encryption_secret.yaml index 59fb77536..946606b17 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/01-ibm-manage_attachments_secrets.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/01-ibm-manage_encryption_secret.yaml @@ -1,5 +1,6 @@ {{- if (or (eq .Values.mas_app_id "manage") (eq .Values.mas_app_id "health")) }} -{{- if .Values.manage_attachments_secret_name }} +{{- if hasKey .Values "global_secrets" }} +{{- if and (hasKey .Values "mas_appws_spec") (hasKey .Values.mas_appws_spec "settings") (hasKey .Values.mas_appws_spec.settings "db") (hasKey .Values.mas_appws_spec.settings.db "encryptionSecret") }} --- kind: Secret apiVersion: v1 @@ -11,10 +12,13 @@ metadata: labels: {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} - name: {{ .Values.manage_attachments_secret_name }} + name: {{ .Values.mas_appws_spec.settings.db.encryptionSecret }} namespace: {{ .Values.mas_app_namespace }} stringData: - accessSecretKey: {{ .Values.manage_attachments_access_secret_key }} + {{- range $key, $value := $.Values.global_secrets }} + {{ $key }}: {{ $value }} + {{- end }} type: Opaque {{- end }} {{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml b/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml index 22c0faee5..8d6c7eac1 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml @@ -82,8 +82,9 @@ spec: manage_logging_secret_name: {{ $value.manage_logging_secret_name }} manage_logging_access_secret_key: {{ $value.manage_logging_access_secret_key }} - manage_attachments_secret_name: {{ $value.manage_attachments_secret_name }} - manage_attachments_access_secret_key: {{ $value.manage_attachments_access_secret_key }} + {{- if $value.global_secrets }} + global_secrets: {{ $value.global_secrets | toYaml | nindent 14 }} + {{- end }} {{- end }} From ffbd7f0da16177f8359fbe9d2251051e61d39304 Mon Sep 17 00:00:00 2001 From: Andrew Whitfield Date: Mon, 16 Sep 2024 15:12:20 +0100 Subject: [PATCH 4/4] [patch] Add unlimited retries and fix suite cert/dns sync (#192) * [minor] Set retry unlimited on cluster + instance * Set retry to unlimited * Run olm job at same time as dns --- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml | 2 +- .../ibm-mas-account-root/templates/000-cluster-appset.yaml | 2 ++ .../ibm-mas-cluster-root/templates/099-instance-appset.yaml | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml index 33afa3c0d..5c23a3444 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml @@ -7,7 +7,7 @@ metadata: name: "ibm-suite-certs-v1-{{ .Values | toYaml | adler32sum }}" namespace: mas-{{ .Values.instance_id }}-syncres annotations: - argocd.argoproj.io/sync-wave: "00" + argocd.argoproj.io/sync-wave: "003" {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml index 44ad71424..95ee9cdf5 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml @@ -6,7 +6,7 @@ metadata: name: "ibm-suite-dns-v1-{{ .Values | toYaml | adler32sum }}" namespace: mas-{{ .Values.instance_id }}-syncres annotations: - argocd.argoproj.io/sync-wave: "00" + argocd.argoproj.io/sync-wave: "003" {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} diff --git a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml index 8b7cd976a..45459b190 100644 --- a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml +++ b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml @@ -117,6 +117,8 @@ spec: prune: true {{- end }} selfHeal: true + retry: + limit: -1 syncOptions: - CreateNamespace=false - RespectIgnoreDifferences=true diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 9b3905536..bfb5ca8eb 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -209,6 +209,8 @@ spec: syncOptions: - CreateNamespace=false - RespectIgnoreDifferences=true + retry: + limit: -1 ignoreDifferences: - group: '*' kind: ServiceAccount