Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
25d48ee
raise sync-wave priority for Manage over other apps
Aug 26, 2026
dc834e5
fix: set sync-wave order for SDB and Backup job
Aug 26, 2026
3cfabbb
Merge branch 'main' into fix-sync-order-adjustment
svt01 Aug 27, 2026
60f2758
fix: update sync-wave for 04-db2u-Backup_Cron.yaml
Aug 28, 2026
6768109
Merge branch 'main' into fix-sync-order-adjustment
Aug 28, 2026
a42f4a5
Merge branch 'main' into fix-sync-order-adjustment
svt01 Sep 4, 2026
1eeb6b8
Merge branch 'main' into fix-sync-order-adjustment
svt01 Sep 18, 2026
1360db6
update to sync-wave
Sep 18, 2026
853538e
fix: update
Sep 18, 2026
19e5022
fix: updates
Sep 18, 2026
886a105
update for co-wave grouping
Sep 18, 2026
90865c8
Merge branch 'main' into fix-sync-order-adjustment-v2
svt01 Sep 18, 2026
ba93cb4
Merge branch 'main' into fix-sync-order-adjustment-v2
svt01 Sep 21, 2026
df793f0
Merge branch 'main' into fix-sync-order-adjustment-v2
svt01 Sep 21, 2026
734a5f8
Merge branch 'main' into fix-sync-order-adjustment-v2
svt01 Sep 21, 2026
e2107f8
Merge branch 'main' into fix-sync-order-adjustment-v2
svt01 Sep 22, 2026
453569a
Merge branch 'main' into fix-sync-order-adjustment-v2
svt01 Sep 23, 2026
5dac987
Merge branch 'main' into fix-sync-order-adjustment-v2
Oct 1, 2026
80243cc
Merge branch 'main' into fix-sync-order-adjustment-v3
Oct 8, 2026
4db8ab3
update the sync wave for secondary db
Oct 12, 2026
bfa8a21
Merge branch 'main' into fix-sync-order-adjustment-v3
svt01 Oct 16, 2026
945e3ae
Merge branch 'main' into fix-sync-order-adjustment-v3
svt01 Oct 16, 2026
21eaed6
Merge branch 'main' into fix-sync-order-adjustment-v3
Oct 21, 2026
f5576a1
update the sync-waves
Oct 21, 2026
a38042c
include presync hook for sdb
Oct 23, 2026
fe1682a
Revert "include presync hook for sdb"
Oct 23, 2026
e0fef99
delete 00-presync-await-crd_Job.yaml
Oct 26, 2026
da09923
Merge branch 'main' into fix-sync-order-adjustment-v3
Oct 29, 2026
1395c7f
changes
Oct 29, 2026
4f9baec
Merge branch 'main' into fix-sync-order-adjustment-v3
svt01 Oct 30, 2026
266d297
update for 00-presync-await-crd
Oct 30, 2026
92e7149
prioritise manage
Nov 5, 2026
3bd15fa
Merge branch 'main' into fix-sync-order-adjustment-v3
Nov 5, 2026
8b0d401
per-app block changes
Nov 6, 2026
9e59b06
update 130-ibm-mas-suite-configs-app.yaml
Nov 6, 2026
91309d2
update
Nov 6, 2026
22a6fd7
Merge branch 'main' into fix-sync-order-adjustment-v3
svt01 Nov 11, 2026
9ef335b
Merge branch 'main' into fix-sync-order-adjustment-v3
svt01 Nov 13, 2026
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
2 changes: 1 addition & 1 deletion instance-applications/120-ibm-db2u-database/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,4 @@ cluster_domain: "<path:secrets/path:cluster_domain>"
## Related Documentation

- [Instance Base Values Reference](../../docs/reference/instance-base-values.md)
- [IBM Db2u Operator Documentation](https://www.ibm.com/docs/en/db2/11.5)
- [IBM Db2u Operator Documentation](https://www.ibm.com/docs/en/db2/11.5)
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: "db2u-issuer-{{ .Values.db2_instance_name }}"
namespace: "{{ .Values.db2_namespace }}"
annotations:
argocd.argoproj.io/sync-wave: "120"
argocd.argoproj.io/sync-wave: {{ add 120 (ternary 600 0 (contains "sdb" .Values.db2_instance_name)) | quote }}
{{- if .Values.custom_labels }}
labels:
{{ .Values.custom_labels | toYaml | indent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: "db2u-certificate-{{ .Values.db2_instance_name }}"
namespace: "{{ .Values.db2_namespace }}"
annotations:
argocd.argoproj.io/sync-wave: "121"
argocd.argoproj.io/sync-wave: {{ add 121 (ternary 600 0 (contains "sdb" .Values.db2_instance_name)) | quote }}
{{- if .Values.custom_labels }}
labels:
{{ .Values.custom_labels | toYaml | indent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: "{{ .Values.db2_instance_name | lower }}"
namespace: "{{ .Values.db2_namespace }}"
annotations:
argocd.argoproj.io/sync-wave: "122"
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: {{ add 122 (ternary 600 0 (contains "sdb" .Values.db2_instance_name)) | quote }}
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
{{- if .Values.custom_labels }}
labels:
{{ .Values.custom_labels | toYaml | indent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
name: db2u-{{ .Values.db2_instance_name }}-tls-route
namespace: "{{ .Values.db2_namespace }}"
annotations:
argocd.argoproj.io/sync-wave: "123"
argocd.argoproj.io/sync-wave: {{ add 123 (ternary 600 0 (contains "sdb" .Values.db2_instance_name)) | quote }}
labels:
formation_id: "{{ .Values.db2_instance_name | lower }}"
{{- if eq .Values.jdbc_route "public" }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ metadata:
name: aws-db2-user-job-{{ .Values.instance_id }}-{{ .Values.mas_application_id }}-{{ .Values.db2_instance_name }}-role-db2
namespace: {{ .Values.db2_namespace }}
annotations:
argocd.argoproj.io/sync-wave: "121"
argocd.argoproj.io/sync-wave: {{ add 121 (ternary 600 0 (contains "sdb" .Values.db2_instance_name)) | quote }}
{{- if .Values.custom_labels }}
labels:
{{ .Values.custom_labels | toYaml | indent 4 }}
Expand Down Expand Up @@ -59,7 +59,7 @@ metadata:
name: aws-db2-user-job-{{ .Values.instance_id }}-{{ .Values.mas_application_id }}-{{ .Values.db2_instance_name }}-rolebinding-db2
namespace: {{ .Values.db2_namespace }}
annotations:
argocd.argoproj.io/sync-wave: "122"
argocd.argoproj.io/sync-wave: {{ add 122 (ternary 600 0 (contains "sdb" .Values.db2_instance_name)) | quote }}
{{- if .Values.custom_labels }}
labels:
{{ .Values.custom_labels | toYaml | indent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ kind: Service
metadata:
name: c-{{ .Values.db2_instance_name }}-db2u-hadr-svc
namespace: "{{ .Values.db2_namespace }}"
annotations:
argocd.argoproj.io/sync-wave: "720"
spec:
selector:
app: {{ .Values.db2_instance_name }}
Expand All @@ -30,6 +32,8 @@ kind: NetworkPolicy
metadata:
name: c-{{ .Values.db2_instance_name }}-hadr-ext
namespace: "{{ .Values.db2_namespace }}"
annotations:
argocd.argoproj.io/sync-wave: "720"
spec:
ingress:
- ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ metadata:
name: "postsync-hadr-sa-{{ .Values.db2_instance_name }}"
namespace: "{{ .Values.db2_namespace }}"
annotations:
argocd.argoproj.io/sync-wave: "128"
argocd.argoproj.io/sync-wave: "728"
{{- if .Values.custom_labels }}
labels:
{{ .Values.custom_labels | toYaml | indent 4 }}
Expand All @@ -81,7 +81,7 @@ metadata:
name: "db2-database-postsync-hadr-sa-role-{{ .Values.db2_instance_name }}"
namespace: "{{ .Values.db2_namespace }}"
annotations:
argocd.argoproj.io/sync-wave: "128"
argocd.argoproj.io/sync-wave: "728"
{{- if .Values.custom_labels }}
labels:
{{ .Values.custom_labels | toYaml | indent 4 }}
Expand Down Expand Up @@ -143,7 +143,7 @@ metadata:
name: "db2-database-postsync-hadr-sa-rb-{{ .Values.db2_instance_name }}"
namespace: "{{ .Values.db2_namespace }}"
annotations:
argocd.argoproj.io/sync-wave: "128"
argocd.argoproj.io/sync-wave: "728"
{{- if .Values.custom_labels }}
labels:
{{ .Values.custom_labels | toYaml | indent 4 }}
Expand All @@ -164,7 +164,7 @@ metadata:
name: {{ $_job_name }}
namespace: "{{ .Values.db2_namespace }}"
annotations:
argocd.argoproj.io/sync-wave: "130"
argocd.argoproj.io/sync-wave: "730"
labels:
mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
{{- if .Values.custom_labels }}
Expand Down
33 changes: 20 additions & 13 deletions root-applications/ibm-mas-instance-root/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,14 @@ Applications are deployed in the following order (controlled by sync-wave annota
2. **100-121: Dependencies** - SLS, Db2, CP4D, databases, and CP4D services
3. **130: MAS Suite** - Core MAS suite installation and configurations
4. **200: Workspaces** - MAS workspace creation
5. **500-550: Applications** - MAS application installations and configurations
5. **500-551: Applications** - each MAS app is deployed as a contiguous block: primary Db2 (PDB) -> in-cluster Db2 JDBC config -> app install -> app workspace config -> standby Db2 (SDB). Waves are computed by the `ibm-mas-instance-root.syncwave` helper in [`_helpers.tpl`](templates/_helpers.tpl). The JDBC config (`130-ibm-mas-suite-configs-app.yaml`) moves into the block only for in-cluster Db2 of non-Manage apps; otherwise it stays at `130`.
- **Manage**: PDB `120`, install `502`, workspace config `503`, SDB `504` (JDBC config stays at `130`)
- **Facilities**: PDB `505`, JDBC `506`, install `507`, workspace config `508`, SDB `509`
- **Monitor / IoT**: Monitor then IoT when the Monitor or IoT channel is >= 9.2 (Monitor `510`-`514`, IoT `515`-`519`); otherwise IoT then Monitor (IoT `510`-`514`, Monitor `515`-`519`)
- **Health**: PDB `520`, JDBC `521`, install `522`, workspace config `523`, SDB `524`
- **Assist**: `525`-`529`; **Visual Inspection**: `530`-`534`; **Optimizer**: `535`-`539`
- **Predict**: PDB `540`, JDBC `541`, install `542`, workspace config `543`, SDB `544`
- **551**: Addons config
6. **600: RBAC & Post-Sync** - RBAC setup and post-deployment validation

## Configuration Files
Expand Down Expand Up @@ -207,7 +214,7 @@ The following table lists all ArgoCD applications defined in the templates folde
| [`110-ibm-cp4d-operator-app.yaml`](templates/110-ibm-cp4d-operator-app.yaml) | cp4doperator | ✓ | | | 110 |
| [`110-ibm-cs-control-app.yaml`](templates/110-ibm-cs-control-app.yaml) | cscontrol | ✓ | | | 110 |
| [`110-ibm-db2u-app.yaml`](templates/110-ibm-db2u-app.yaml) | db2u | ✓ | | | 110 |
| [`120-db2-databases-app.yaml`](templates/120-db2-databases-app.yaml) | db2-db | | ✓ | | 120 |
| [`120-db2-databases-app.yaml`](templates/120-db2-databases-app.yaml) | db2-db | | ✓ | | Per app block, see Deployment Sequence (PDB first, SDB after the workspace config) |
| [`120-dbs-rds-databases-app.yaml`](templates/120-dbs-rds-databases-app.yaml) | dbs-rds-db | | | ✓ | 120 |
| [`120-ibm-cognos-analytics-app.yaml`](templates/120-ibm-cognos-analytics-app.yaml) | cognos | ✓ | | | 120 |
| [`120-ibm-spark-app.yaml`](templates/120-ibm-spark-app.yaml) | spark | ✓ | | | 120 |
Expand All @@ -218,17 +225,17 @@ The following table lists all ArgoCD applications defined in the templates folde
| [`130-ibm-mas-suite-app.yaml`](templates/130-ibm-mas-suite-app.yaml) | suite | | | ✓ | 130 |
| [`130-ibm-mas-suite-configs-app.yaml`](templates/130-ibm-mas-suite-configs-app.yaml) | mas_config_name | | ✓ | | 130 |
| [`200-ibm-mas-workspaces.yaml`](templates/200-ibm-mas-workspaces.yaml) | workspace | | ✓ | | 200 |
| [`500-ibm-mas-masapp-manage-install.yaml`](templates/500-ibm-mas-masapp-manage-install.yaml) | manage | | | ✓ | 500 |
| [`505-ibm-mas-masapp-facilities-install.yaml`](templates/505-ibm-mas-masapp-facilities-install.yaml) | facilities | | | ✓ | 505 |
| [`510-ibm-mas-masapp-assist-install.yaml`](templates/510-ibm-mas-masapp-assist-install.yaml) | assist | | | ✓ | 510 |
| [`510-ibm-mas-masapp-iot-install.yaml`](templates/510-ibm-mas-masapp-iot-install.yaml) | iot | | | ✓ | 510 |
| [`510-ibm-mas-masapp-visualinspection-install.yaml`](templates/510-ibm-mas-masapp-visualinspection-install.yaml) | visualinspection | | | ✓ | 510 |
| [`510-550-ibm-mas-masapp-configs.yaml`](templates/510-550-ibm-mas-masapp-configs.yaml) | masapp-config | | ✓ | | 510-550 |
| [`520-ibm-mas-masapp-health-install.yaml`](templates/520-ibm-mas-masapp-health-install.yaml) | health | | | ✓ | 520 |
| [`520-ibm-mas-masapp-monitor-install.yaml`](templates/520-ibm-mas-masapp-monitor-install.yaml) | monitor | | | ✓ | 520 |
| [`520-ibm-mas-masapp-optimizer-install.yaml`](templates/520-ibm-mas-masapp-optimizer-install.yaml) | optimizer | | | ✓ | 520 |
| [`540-ibm-mas-masapp-predict-install.yaml`](templates/540-ibm-mas-masapp-predict-install.yaml) | predict | | | ✓ | 540 |
| [`550-ibm-mas-addons-config.yaml`](templates/550-ibm-mas-addons-config.yaml) | addons | | ✓ | | 550 |
| [`500-ibm-mas-masapp-manage-install.yaml`](templates/500-ibm-mas-masapp-manage-install.yaml) | manage | | | ✓ | Per app block, see Deployment Sequence |
| [`505-ibm-mas-masapp-facilities-install.yaml`](templates/505-ibm-mas-masapp-facilities-install.yaml) | facilities | | | ✓ | Per app block, see Deployment Sequence |
| [`510-ibm-mas-masapp-assist-install.yaml`](templates/510-ibm-mas-masapp-assist-install.yaml) | assist | | | ✓ | Per app block, see Deployment Sequence |
| [`510-ibm-mas-masapp-iot-install.yaml`](templates/510-ibm-mas-masapp-iot-install.yaml) | iot | | | ✓ | Per app block, see Deployment Sequence |
| [`510-ibm-mas-masapp-visualinspection-install.yaml`](templates/510-ibm-mas-masapp-visualinspection-install.yaml) | visualinspection | | | ✓ | Per app block, see Deployment Sequence |
| [`510-550-ibm-mas-masapp-configs.yaml`](templates/510-550-ibm-mas-masapp-configs.yaml) | masapp-config | | ✓ | | Per app block, see Deployment Sequence |
| [`520-ibm-mas-masapp-health-install.yaml`](templates/520-ibm-mas-masapp-health-install.yaml) | health | | | ✓ | Per app block, see Deployment Sequence |
| [`520-ibm-mas-masapp-monitor-install.yaml`](templates/520-ibm-mas-masapp-monitor-install.yaml) | monitor | | | ✓ | Per app block, see Deployment Sequence |
| [`520-ibm-mas-masapp-optimizer-install.yaml`](templates/520-ibm-mas-masapp-optimizer-install.yaml) | optimizer | | | ✓ | Per app block, see Deployment Sequence |
| [`540-ibm-mas-masapp-predict-install.yaml`](templates/540-ibm-mas-masapp-predict-install.yaml) | predict | | | ✓ | Per app block, see Deployment Sequence |
| [`550-ibm-mas-addons-config.yaml`](templates/550-ibm-mas-addons-config.yaml) | addons | | ✓ | | 551 |
| [`600-application-admin-rbac-app.yaml`](templates/600-application-admin-rbac-app.yaml) | application-admin-rbac | | ✓ | | 600 |
| [`600-ibm-post-sync-jobs.yaml`](templates/600-ibm-post-sync-jobs.yaml) | postsyncjobs | | | ✓ | 600 |

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ metadata:
instance: '{{ $.Values.instance.id }}'
appId: '{{ $value.mas_application_id }}'
annotations:
{{ if not (contains "sdb" $value.db2_instance_name) }}
argocd.argoproj.io/sync-wave: "120"
{{ else }}
argocd.argoproj.io/sync-wave: "121"
{{ end }}
{{- if not (contains "sdb" $value.db2_instance_name) }}
argocd.argoproj.io/sync-wave: "{{ include "ibm-mas-instance-root.syncwave" (dict "root" $ "app" $value.mas_application_id "step" "pdb") }}"
{{- else }}
argocd.argoproj.io/sync-wave: "{{ include "ibm-mas-instance-root.syncwave" (dict "root" $ "app" $value.mas_application_id "step" "sdb") }}"
{{- end }}
{{- 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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ metadata:
annotations:
{{- if eq $value.mas_config_chart "ibm-mas-aicfg-config" }}
argocd.argoproj.io/sync-wave: "190"
{{- else if and (eq $value.mas_config_chart "ibm-jdbc-config") (eq ($value.jdbc_type | default "") "incluster-db2") (not (empty $value.mas_application_id)) (ne $value.mas_application_id "manage") }}
{{- /* In-cluster Db2 JDBC config reads secrets written by the app's Db2 post-sync job, so it must sync after that app's PDB and before the app install (jdbc wave = PDB + 1, install = PDB + 2). Manage PDB is at 120, so Manage stays at 130. */}}
argocd.argoproj.io/sync-wave: "{{ include "ibm-mas-instance-root.syncwave" (dict "root" $ "app" $value.mas_application_id "step" "jdbc") | default "130" }}"
{{- else }}
argocd.argoproj.io/sync-wave: "130"
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
instance: '{{ .Values.instance.id }}'
masapp: 'manage'
annotations:
argocd.argoproj.io/sync-wave: "500"
argocd.argoproj.io/sync-wave: "{{ include "ibm-mas-instance-root.syncwave" (dict "root" $ "app" "manage" "step" "install") }}"
{{- 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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
instance: '{{ .Values.instance.id }}'
masapp: 'facilities'
annotations:
argocd.argoproj.io/sync-wave: "505"
argocd.argoproj.io/sync-wave: "{{ include "ibm-mas-instance-root.syncwave" (dict "root" $ "app" "facilities" "step" "install") }}"
{{- 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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,6 @@ For example: {{ $.Values.account.id }} (instead of {{ .Values.account.id }} )

{{ $app_dest_ns := printf "mas-%s-core" .Values.instance.id }}

{{- /* Helper variables to check if app versions are >= 9.2 */ -}}
{{- $iot_is_v92_or_higher := false -}}
{{- if and .Values.ibm_suite_app_iot_install .Values.ibm_suite_app_iot_install.mas_app_channel -}}
{{- $iot_is_v92_or_higher = regexMatch "^9\\.(2|[3-9]|[1-9][0-9])\\..*" .Values.ibm_suite_app_iot_install.mas_app_channel -}}
{{- end -}}

{{- $monitor_is_v92_or_higher := false -}}
{{- if and .Values.ibm_suite_app_monitor_install .Values.ibm_suite_app_monitor_install.mas_app_channel -}}
{{- $monitor_is_v92_or_higher = regexMatch "^9\\.(2|[3-9]|[1-9][0-9])\\..*" .Values.ibm_suite_app_monitor_install.mas_app_channel -}}
{{- end -}}

{{- range $i, $value := .Values.ibm_mas_masapp_configs }}
{{- if $.Values.application_admin_role }}
---
Expand All @@ -25,33 +14,7 @@ metadata:
name: "{{ $value.mas_workspace_id }}.{{ $value.mas_app_id }}.{{ $.Values.cluster.id }}.{{ $.Values.instance.id }}"
namespace: {{ $.Values.argo.namespace }}
annotations:
{{- if eq $value.mas_app_id "assist" }}
argocd.argoproj.io/sync-wave: "515"
{{- else if eq $value.mas_app_id "facilities" }}
argocd.argoproj.io/sync-wave: "510"
{{- else if eq $value.mas_app_id "iot" }}
{{- if $iot_is_v92_or_higher }}
argocd.argoproj.io/sync-wave: "530"
{{- else }}
argocd.argoproj.io/sync-wave: "515"
{{- end }}
{{- else if eq $value.mas_app_id "manage" }}
argocd.argoproj.io/sync-wave: "510"
{{- else if eq $value.mas_app_id "visualinspection" }}
argocd.argoproj.io/sync-wave: "515"
{{- else if eq $value.mas_app_id "health" }}
argocd.argoproj.io/sync-wave: "530"
{{- else if eq $value.mas_app_id "monitor" }}
{{- if $monitor_is_v92_or_higher }}
argocd.argoproj.io/sync-wave: "515"
{{- else }}
argocd.argoproj.io/sync-wave: "530"
{{- end }}
{{- else if eq $value.mas_app_id "optimizer" }}
argocd.argoproj.io/sync-wave: "530"
{{- else if eq $value.mas_app_id "predict" }}
argocd.argoproj.io/sync-wave: "550"
{{- end }}
argocd.argoproj.io/sync-wave: "{{ include "ibm-mas-instance-root.syncwave" (dict "root" $ "app" $value.mas_app_id "step" "config") }}"
{{- 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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
instance: '{{ .Values.instance.id }}'
masapp: 'assist'
annotations:
argocd.argoproj.io/sync-wave: "510"
argocd.argoproj.io/sync-wave: "{{ include "ibm-mas-instance-root.syncwave" (dict "root" $ "app" "assist" "step" "install") }}"
{{- 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 }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
{{- if not (empty .Values.ibm_suite_app_iot_install) }}
{{- /* Calculate sync wave based on mas_app_channel version */ -}}
{{- $syncwave := "510" -}}
{{- 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 -}}
{{- if $version -}}
{{- $parts := splitList "." $version -}}
{{- $major := index $parts 0 | int -}}
{{- $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" -}}
{{- end -}}
{{- end -}}
{{- end -}}
---
# IBM Maximo Operator Catalog
apiVersion: argoproj.io/v1alpha1
Expand All @@ -31,7 +16,7 @@ metadata:
instance: '{{ .Values.instance.id }}'
masapp: 'iot'
annotations:
argocd.argoproj.io/sync-wave: "{{ $syncwave }}"
argocd.argoproj.io/sync-wave: "{{ include "ibm-mas-instance-root.syncwave" (dict "root" $ "app" "iot" "step" "install") }}"
{{- 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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
instance: '{{ .Values.instance.id }}'
masapp: 'visualinspection'
annotations:
argocd.argoproj.io/sync-wave: "510"
argocd.argoproj.io/sync-wave: "{{ include "ibm-mas-instance-root.syncwave" (dict "root" $ "app" "visualinspection" "step" "install") }}"
{{- 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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
instance: '{{ .Values.instance.id }}'
masapp: 'health'
annotations:
argocd.argoproj.io/sync-wave: "520"
argocd.argoproj.io/sync-wave: "{{ include "ibm-mas-instance-root.syncwave" (dict "root" $ "app" "health" "step" "install") }}"
{{- 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 }}
Expand Down
Loading
Loading