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