From 648dd52aeb8df62f6969decb2c11b58ad9ea2394 Mon Sep 17 00:00:00 2001 From: whitfiea Date: Sat, 14 Sep 2024 16:12:08 +0100 Subject: [PATCH 1/3] [minor] Set retry unlimited on cluster + instance --- .../ibm-mas-account-root/templates/000-cluster-appset.yaml | 2 ++ .../ibm-mas-cluster-root/templates/099-instance-appset.yaml | 2 ++ 2 files changed, 4 insertions(+) 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..141cff873 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: 0 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..62663dea9 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: 0 ignoreDifferences: - group: '*' kind: ServiceAccount From dddd16d645dd867fdf90f4929efdc7a332084133 Mon Sep 17 00:00:00 2001 From: whitfiea Date: Sun, 15 Sep 2024 11:09:12 +0100 Subject: [PATCH 2/3] Set retry to unlimited --- .../ibm-mas-account-root/templates/000-cluster-appset.yaml | 2 +- .../ibm-mas-cluster-root/templates/099-instance-appset.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 141cff873..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 @@ -118,7 +118,7 @@ spec: {{- end }} selfHeal: true retry: - limit: 0 + 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 62663dea9..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 @@ -210,7 +210,7 @@ spec: - CreateNamespace=false - RespectIgnoreDifferences=true retry: - limit: 0 + limit: -1 ignoreDifferences: - group: '*' kind: ServiceAccount From 7b1862b0646534022f49fe0c5f5fdabdca1577aa Mon Sep 17 00:00:00 2001 From: whitfiea Date: Sun, 15 Sep 2024 17:34:06 +0100 Subject: [PATCH 3/3] 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 +- 2 files changed, 2 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 }}