diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml index 9929f7077..fc6b47aae 100644 --- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml @@ -12,6 +12,8 @@ apiVersion: batch/v1 metadata: name: "db2-backup-job-v1-{{ .Values.db2_instance_name }}" namespace: "{{ .Values.db2_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "525" labels: parent: cronjob cosBucket: "{{ .Values.db2_backup_bucket_name }}" diff --git a/root-applications/ibm-mas-instance-root/templates/120-db2-databases-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-db2-databases-app.yaml index af6b2ce05..291a1a43a 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-db2-databases-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-db2-databases-app.yaml @@ -22,7 +22,7 @@ metadata: {{ if not (contains "sdb" $value.db2_instance_name) }} argocd.argoproj.io/sync-wave: "120" {{ else }} - argocd.argoproj.io/sync-wave: "121" + argocd.argoproj.io/sync-wave: "520" {{ end }} {{- if and $.Values.notifications $.Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ $.Values.notifications.slack_channel_id }} diff --git a/root-applications/ibm-mas-instance-root/templates/505-ibm-mas-masapp-facilities-install.yaml b/root-applications/ibm-mas-instance-root/templates/505-ibm-mas-masapp-facilities-install.yaml index 0bcce1153..dbb1e9def 100644 --- a/root-applications/ibm-mas-instance-root/templates/505-ibm-mas-masapp-facilities-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/505-ibm-mas-masapp-facilities-install.yaml @@ -16,7 +16,7 @@ metadata: instance: '{{ .Values.instance.id }}' masapp: 'facilities' annotations: - argocd.argoproj.io/sync-wave: "505" + argocd.argoproj.io/sync-wave: "510" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} 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 01abb1483..c5d3b093e 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 @@ -26,31 +26,31 @@ metadata: namespace: {{ $.Values.argo.namespace }} annotations: {{- if eq $value.mas_app_id "assist" }} - argocd.argoproj.io/sync-wave: "515" + argocd.argoproj.io/sync-wave: "520" {{- else if eq $value.mas_app_id "facilities" }} - argocd.argoproj.io/sync-wave: "510" + argocd.argoproj.io/sync-wave: "515" {{- else if eq $value.mas_app_id "iot" }} {{- if $iot_is_v92_or_higher }} - argocd.argoproj.io/sync-wave: "530" + argocd.argoproj.io/sync-wave: "535" {{- else }} - argocd.argoproj.io/sync-wave: "515" + argocd.argoproj.io/sync-wave: "525" {{- end }} {{- else if eq $value.mas_app_id "manage" }} - argocd.argoproj.io/sync-wave: "510" + argocd.argoproj.io/sync-wave: "505" {{- else if eq $value.mas_app_id "visualinspection" }} - argocd.argoproj.io/sync-wave: "515" + argocd.argoproj.io/sync-wave: "520" {{- else if eq $value.mas_app_id "health" }} - argocd.argoproj.io/sync-wave: "530" + argocd.argoproj.io/sync-wave: "535" {{- else if eq $value.mas_app_id "monitor" }} {{- if $monitor_is_v92_or_higher }} - argocd.argoproj.io/sync-wave: "515" + argocd.argoproj.io/sync-wave: "525" {{- else }} - argocd.argoproj.io/sync-wave: "530" + argocd.argoproj.io/sync-wave: "535" {{- end }} {{- else if eq $value.mas_app_id "optimizer" }} - argocd.argoproj.io/sync-wave: "530" + argocd.argoproj.io/sync-wave: "535" {{- else if eq $value.mas_app_id "predict" }} - argocd.argoproj.io/sync-wave: "550" + argocd.argoproj.io/sync-wave: "555" {{- end }} {{- if and $.Values.notifications $.Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ $.Values.notifications.slack_channel_id }} diff --git a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml index 6f13fd6f5..f1171b653 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml @@ -16,7 +16,7 @@ metadata: instance: '{{ .Values.instance.id }}' masapp: 'assist' annotations: - argocd.argoproj.io/sync-wave: "510" + argocd.argoproj.io/sync-wave: "515" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} diff --git a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml index 32b160caf..9c3a9ef28 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml @@ -1,6 +1,6 @@ {{- if not (empty .Values.ibm_suite_app_iot_install) }} {{- /* Calculate sync wave based on mas_app_channel version */ -}} -{{- $syncwave := "510" -}} +{{- $syncwave := "520" -}} {{- if .Values.ibm_suite_app_iot_install.mas_app_channel -}} {{- $channel := .Values.ibm_suite_app_iot_install.mas_app_channel | toString -}} {{- $version := regexFind `^[0-9]+\.[0-9]+` $channel -}} @@ -10,7 +10,7 @@ {{- $minor := index $parts 1 | int -}} {{- /* Use sync wave 520 for version >= 9.2, otherwise 510 */ -}} {{- if or (gt $major 9) (and (eq $major 9) (ge $minor 2)) -}} - {{- $syncwave = "520" -}} + {{- $syncwave = "530" -}} {{- end -}} {{- end -}} {{- end -}} diff --git a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml index 40c24c1d3..3c2fa0989 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml @@ -16,7 +16,7 @@ metadata: instance: '{{ .Values.instance.id }}' masapp: 'visualinspection' annotations: - argocd.argoproj.io/sync-wave: "510" + argocd.argoproj.io/sync-wave: "515" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} diff --git a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml index f6c65862a..abd42dc9b 100644 --- a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml @@ -16,7 +16,7 @@ metadata: instance: '{{ .Values.instance.id }}' masapp: 'health' annotations: - argocd.argoproj.io/sync-wave: "520" + argocd.argoproj.io/sync-wave: "530" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} diff --git a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml index ff75b7346..d5a182516 100644 --- a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml @@ -1,6 +1,6 @@ {{- if not (empty .Values.ibm_suite_app_monitor_install) }} {{- /* Calculate sync wave based on mas_app_channel version */ -}} -{{- $syncwave := "520" -}} +{{- $syncwave := "530" -}} {{- if .Values.ibm_suite_app_monitor_install.mas_app_channel -}} {{- $channel := .Values.ibm_suite_app_monitor_install.mas_app_channel | toString -}} {{- $version := regexFind `^[0-9]+\.[0-9]+` $channel -}} @@ -10,7 +10,7 @@ {{- $minor := index $parts 1 | int -}} {{- /* Use sync wave 510 for version >= 9.2, otherwise 520 */ -}} {{- if or (gt $major 9) (and (eq $major 9) (ge $minor 2)) -}} - {{- $syncwave = "510" -}} + {{- $syncwave = "520" -}} {{- end -}} {{- end -}} {{- end -}} diff --git a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml index ddfd2995c..bcdb3f8e3 100644 --- a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml @@ -16,7 +16,7 @@ metadata: instance: '{{ .Values.instance.id }}' masapp: 'optimizer' annotations: - argocd.argoproj.io/sync-wave: "520" + argocd.argoproj.io/sync-wave: "530" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} diff --git a/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml b/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml index 746a1e85c..1599d9af8 100644 --- a/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml @@ -16,7 +16,7 @@ metadata: instance: '{{ .Values.instance.id }}' masapp: 'predict' annotations: - argocd.argoproj.io/sync-wave: "540" + argocd.argoproj.io/sync-wave: "545" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }}