[minor] fix sync order adjustment v3 by svt01 · Pull Request #626 · ibm-mas/gitops

svt01 · 2026-10-01T07:14:22Z

Description

This PR reworks the ArgoCD sync-wave ordering for MAS GitOps so that each MAS application deploys as one contiguous block. The block order is Db2 PDB → JDBC config → app install → workspace config → Db2 SDB. The next application's block starts only after the previous one completes.

On main, every Db2 PDB syncs at 120 and every SDB at 121. That is long before the app schema exists, so HADR standby pairing can race the primary and the owning app. One slow or failing app also blocks unrelated apps.

Changes:

Central wave helper. New ibm-mas-instance-root.syncwave in templates/_helpers.tpl computes all root-level waves from the app id and step (pdb, jdbc, install, config, sdb). It replaces the duplicated per-template wave logic.
Manage PDB stays at 120. Manage install, config and SDB follow at 502, 503 and 504. Non-Manage PDBs start at 505+.
Monitor/IoT channel rule kept. If either channel is >= 9.2, Monitor goes first, otherwise IoT does. main evaluated the two channels independently, so this is a small behaviour change.
In-cluster Db2 JDBC config for non-Manage apps (130-ibm-mas-suite-configs-app.yaml). It moves into the app block, at PDB + 1. Previously it stayed at 130 after the PDB moved to 505+, so ArgoCD failed with an AVP ResourceNotFoundException because the Db2 postsync-setup-db2 job had not yet written the secret. Having its own wave before the install also avoids a "missing JDBC binding" race.
Db2 chart internal waves. SDB resources get a +600 offset (720–723). HADR services are fixed at 720. HADR pairing RBAC and job move from 128/130 to 728/730. The primary backup CronJob is pinned to 525.
Docs. The root-application README.md is updated with the new deployment sequence. sync-wave-adjustments.md is added as the reference and porting spec.

Related Issues

https://jsw.ibm.com/browse/MASCORE-19150
https://jsw.ibm.com/browse/MASCORE-20414
https://jsw.ibm.com/browse/MASCORE-21538

How Has This Been Tested?

1. Static checks (`helm-lint.sh`)

`./build/bin/helm-lint.sh -p root-applications/ibm-mas-instance-root`

Exit code: 0

--------
Linting chart root-applications/ibm-mas-instance-root using Helm lint
==> Linting root-applications/ibm-mas-instance-root
[INFO] Chart.yaml: icon is recommended

1 chart(s) linted, 0 chart(s) failed
--------
Templating chart root-applications/ibm-mas-instance-root using Helm template
<rendered manifests omitted: 214 lines, exit code 0>

`./build/bin/helm-lint.sh -p instance-applications/120-ibm-db2u-database`

Exit code: 0

Saving 1 charts
Deleting outdated charts
--------
Linting chart instance-applications/120-ibm-db2u-database using Helm lint
==> Linting instance-applications/120-ibm-db2u-database
[INFO] Chart.yaml: icon is recommended

1 chart(s) linted, 0 chart(s) failed
--------
Templating chart instance-applications/120-ibm-db2u-database using Helm template
<rendered manifests omitted: 1 lines, exit code 0>

Both charts lint with 0 chart(s) failed. The only message is the informational Chart.yaml: icon is recommended.

2. Rendered sync-wave order

The chart's default values.yaml renders almost nothing, so I rendered it with synthetic values that enable all nine apps.

Each app has an install entry, a primary Db2 (PDB), a standby Db2 (-sdb), a workspace config and an in-cluster Db2 JDBC config.
The only difference between the two cases is the Monitor and IoT channel (9.2.x or 9.1.x).
Every other app is on 9.1.x.

helm template root-applications/ibm-mas-instance-root -f values-92.yaml   # Monitor and IoT channel 9.2.x
helm template root-applications/ibm-mas-instance-root -f values-91.yaml   # Monitor and IoT channel 9.1.x

Each Application's argocd.argoproj.io/sync-wave annotation was then extracted and sorted in ascending order.

Test values (values-92.yaml; values-91.yaml differs only in the Monitor/IoT mas_app_channel)

allow_list:
  ips:
  - 1.2.3.4
application_admin_role: true
cli_image_repo: quay.io/ibmmas/cli
cluster_admin_role: true
generator:
  repo_url: https://example/repo
  revision: main
ibm_db2u:
  db2_namespace: db2u
ibm_db2u_databases:
- db2_instance_name: db2wh-inst1-manage
  db2_instance_name_x: 1
  mas_application_id: manage
- db2_instance_name: db2wh-inst1-manage-sdb
  db2_instance_name_x: 1
  mas_application_id: manage
- db2_instance_name: db2wh-inst1-facilities
  db2_instance_name_x: 1
  mas_application_id: facilities
- db2_instance_name: db2wh-inst1-facilities-sdb
  db2_instance_name_x: 1
  mas_application_id: facilities
- db2_instance_name: db2wh-inst1-monitor
  db2_instance_name_x: 1
  mas_application_id: monitor
- db2_instance_name: db2wh-inst1-monitor-sdb
  db2_instance_name_x: 1
  mas_application_id: monitor
- db2_instance_name: db2wh-inst1-iot
  db2_instance_name_x: 1
  mas_application_id: iot
- db2_instance_name: db2wh-inst1-iot-sdb
  db2_instance_name_x: 1
  mas_application_id: iot
- db2_instance_name: db2wh-inst1-health
  db2_instance_name_x: 1
  mas_application_id: health
- db2_instance_name: db2wh-inst1-health-sdb
  db2_instance_name_x: 1
  mas_application_id: health
- db2_instance_name: db2wh-inst1-assist
  db2_instance_name_x: 1
  mas_application_id: assist
- db2_instance_name: db2wh-inst1-assist-sdb
  db2_instance_name_x: 1
  mas_application_id: assist
- db2_instance_name: db2wh-inst1-visualinspection
  db2_instance_name_x: 1
  mas_application_id: visualinspection
- db2_instance_name: db2wh-inst1-visualinspection-sdb
  db2_instance_name_x: 1
  mas_application_id: visualinspection
- db2_instance_name: db2wh-inst1-optimizer
  db2_instance_name_x: 1
  mas_application_id: optimizer
- db2_instance_name: db2wh-inst1-optimizer-sdb
  db2_instance_name_x: 1
  mas_application_id: optimizer
- db2_instance_name: db2wh-inst1-predict
  db2_instance_name_x: 1
  mas_application_id: predict
- db2_instance_name: db2wh-inst1-predict-sdb
  db2_instance_name_x: 1
  mas_application_id: predict
ibm_mas_masapp_configs:
- mas_app_id: manage
  mas_config_chart: ibm-mas-manage-config
  mas_workspace_id: ws1
- mas_app_id: facilities
  mas_config_chart: x
  mas_workspace_id: ws1
- mas_app_id: monitor
  mas_config_chart: x
  mas_workspace_id: ws1
- mas_app_id: iot
  mas_config_chart: x
  mas_workspace_id: ws1
- mas_app_id: health
  mas_config_chart: x
  mas_workspace_id: ws1
- mas_app_id: assist
  mas_config_chart: x
  mas_workspace_id: ws1
- mas_app_id: visualinspection
  mas_config_chart: x
  mas_workspace_id: ws1
- mas_app_id: optimizer
  mas_config_chart: x
  mas_workspace_id: ws1
- mas_app_id: predict
  mas_config_chart: x
  mas_workspace_id: ws1
ibm_mas_suite:
  mas_channel: 9.2.x
ibm_mas_suite_configs:
- jdbc_type: incluster-db2
  mas_application_id: manage
  mas_config_chart: ibm-jdbc-config
  mas_config_name: jdbc-wsapp-main-manage
  mas_config_scope: wsapp
- jdbc_type: incluster-db2
  mas_application_id: facilities
  mas_config_chart: ibm-jdbc-config
  mas_config_name: jdbc-wsapp-main-facilities
  mas_config_scope: wsapp
- jdbc_type: incluster-db2
  mas_application_id: monitor
  mas_config_chart: ibm-jdbc-config
  mas_config_name: jdbc-wsapp-main-monitor
  mas_config_scope: wsapp
- jdbc_type: incluster-db2
  mas_application_id: iot
  mas_config_chart: ibm-jdbc-config
  mas_config_name: jdbc-wsapp-main-iot
  mas_config_scope: wsapp
- jdbc_type: incluster-db2
  mas_application_id: health
  mas_config_chart: ibm-jdbc-config
  mas_config_name: jdbc-wsapp-main-health
  mas_config_scope: wsapp
- jdbc_type: incluster-db2
  mas_application_id: assist
  mas_config_chart: ibm-jdbc-config
  mas_config_name: jdbc-wsapp-main-assist
  mas_config_scope: wsapp
- jdbc_type: incluster-db2
  mas_application_id: visualinspection
  mas_config_chart: ibm-jdbc-config
  mas_config_name: jdbc-wsapp-main-visualinspection
  mas_config_scope: wsapp
- jdbc_type: incluster-db2
  mas_application_id: optimizer
  mas_config_chart: ibm-jdbc-config
  mas_config_name: jdbc-wsapp-main-optimizer
  mas_config_scope: wsapp
- jdbc_type: incluster-db2
  mas_application_id: predict
  mas_config_chart: ibm-jdbc-config
  mas_config_name: jdbc-wsapp-main-predict
  mas_config_scope: wsapp
- mas_config_chart: ibm-mas-aicfg-config
  mas_config_name: aicfg
ibm_mas_workspaces:
- mas_workspace_id: ws1
ibm_suite_app_assist_install:
  ibm_entitlement_key: k
  mas_app_api_version: apps.mas.ibm.com/v1
  mas_app_catalog_source: ibm-operator-catalog
  mas_app_channel: 9.1.x
  mas_app_id: assist
  mas_app_kind: X
  mas_app_namespace: mas-inst1-assist
  mas_app_ws_api_version: apps.mas.ibm.com/v1
  mas_app_ws_kind: XW
ibm_suite_app_facilities_install:
  ibm_entitlement_key: k
  mas_app_api_version: apps.mas.ibm.com/v1
  mas_app_catalog_source: ibm-operator-catalog
  mas_app_channel: 9.1.x
  mas_app_id: facilities
  mas_app_kind: X
  mas_app_namespace: mas-inst1-facilities
  mas_app_ws_api_version: apps.mas.ibm.com/v1
  mas_app_ws_kind: XW
ibm_suite_app_health_install:
  ibm_entitlement_key: k
  mas_app_api_version: apps.mas.ibm.com/v1
  mas_app_catalog_source: ibm-operator-catalog
  mas_app_channel: 9.1.x
  mas_app_id: health
  mas_app_kind: X
  mas_app_namespace: mas-inst1-health
  mas_app_ws_api_version: apps.mas.ibm.com/v1
  mas_app_ws_kind: XW
ibm_suite_app_iot_install:
  ibm_entitlement_key: k
  mas_app_api_version: apps.mas.ibm.com/v1
  mas_app_catalog_source: ibm-operator-catalog
  mas_app_channel: 9.2.x
  mas_app_id: iot
  mas_app_kind: X
  mas_app_namespace: mas-inst1-iot
  mas_app_ws_api_version: apps.mas.ibm.com/v1
  mas_app_ws_kind: XW
ibm_suite_app_manage_install:
  ibm_entitlement_key: k
  mas_app_api_version: apps.mas.ibm.com/v1
  mas_app_catalog_source: ibm-operator-catalog
  mas_app_channel: 9.1.x
  mas_app_id: manage
  mas_app_kind: X
  mas_app_namespace: mas-inst1-manage
  mas_app_ws_api_version: apps.mas.ibm.com/v1
  mas_app_ws_kind: XW
ibm_suite_app_monitor_install:
  ibm_entitlement_key: k
  mas_app_api_version: apps.mas.ibm.com/v1
  mas_app_catalog_source: ibm-operator-catalog
  mas_app_channel: 9.2.x
  mas_app_id: monitor
  mas_app_kind: X
  mas_app_namespace: mas-inst1-monitor
  mas_app_ws_api_version: apps.mas.ibm.com/v1
  mas_app_ws_kind: XW
ibm_suite_app_optimizer_install:
  ibm_entitlement_key: k
  mas_app_api_version: apps.mas.ibm.com/v1
  mas_app_catalog_source: ibm-operator-catalog
  mas_app_channel: 9.1.x
  mas_app_id: optimizer
  mas_app_kind: X
  mas_app_namespace: mas-inst1-optimizer
  mas_app_ws_api_version: apps.mas.ibm.com/v1
  mas_app_ws_kind: XW
ibm_suite_app_predict_install:
  ibm_entitlement_key: k
  mas_app_api_version: apps.mas.ibm.com/v1
  mas_app_catalog_source: ibm-operator-catalog
  mas_app_channel: 9.1.x
  mas_app_id: predict
  mas_app_kind: X
  mas_app_namespace: mas-inst1-predict
  mas_app_ws_api_version: apps.mas.ibm.com/v1
  mas_app_ws_kind: XW
ibm_suite_app_visualinspection_install:
  ibm_entitlement_key: k
  mas_app_api_version: apps.mas.ibm.com/v1
  mas_app_catalog_source: ibm-operator-catalog
  mas_app_channel: 9.1.x
  mas_app_id: visualinspection
  mas_app_kind: X
  mas_app_namespace: mas-inst1-visualinspection
  mas_app_ws_api_version: apps.mas.ibm.com/v1
  mas_app_ws_kind: XW

Case A: Monitor or IoT channel `>= 9.2` (Monitor first)

Wave	Application
`0`	`syncres.cluster1.inst1`
`10`	`syncjobs.cluster1.inst1`
`110`	`db2u.cluster1.inst1`
`120`	`db2-db.cluster1.inst1.manage`
`130`	`jdbc-wsapp-main-manage.cluster1`
`130`	`suite.cluster1.inst1`
`190`	`aicfg.cluster1`
`200`	`ws1.suite.cluster1.inst1`
`502`	`manage.cluster1.inst1`
`503`	`ws1.manage.cluster1.inst1`
`504`	`db2-db.cluster1.inst1.manage-sdb`
`505`	`db2-db.cluster1.inst1.facilities`
`506`	`jdbc-wsapp-main-facilities.cluster1`
`507`	`facilities.cluster1.inst1`
`508`	`ws1.facilities.cluster1.inst1`
`509`	`db2-db.cluster1.inst1.facilities-sdb`
`510`	`db2-db.cluster1.inst1.monitor`
`511`	`jdbc-wsapp-main-monitor.cluster1`
`512`	`monitor.cluster1.inst1`
`513`	`ws1.monitor.cluster1.inst1`
`514`	`db2-db.cluster1.inst1.monitor-sdb`
`515`	`db2-db.cluster1.inst1.iot`
`516`	`jdbc-wsapp-main-iot.cluster1`
`517`	`iot.cluster1.inst1`
`518`	`ws1.iot.cluster1.inst1`
`519`	`db2-db.cluster1.inst1.iot-sdb`
`520`	`db2-db.cluster1.inst1.health`
`521`	`jdbc-wsapp-main-health.cluster1`
`522`	`health.cluster1.inst1`
`523`	`ws1.health.cluster1.inst1`
`524`	`db2-db.cluster1.inst1.health-sdb`
`525`	`db2-db.cluster1.inst1.assist`
`526`	`jdbc-wsapp-main-assist.cluster1`
`527`	`assist.cluster1.inst1`
`528`	`ws1.assist.cluster1.inst1`
`529`	`db2-db.cluster1.inst1.assist-sdb`
`530`	`db2-db.cluster1.inst1.visualinspection`
`531`	`jdbc-wsapp-main-visualinspection.cluster1`
`532`	`visualinspection.cluster1.inst1`
`533`	`ws1.visualinspection.cluster1.inst1`
`534`	`db2-db.cluster1.inst1.visualinspection-sdb`
`535`	`db2-db.cluster1.inst1.optimizer`
`536`	`jdbc-wsapp-main-optimizer.cluster1`
`537`	`optimizer.cluster1.inst1`
`538`	`ws1.optimizer.cluster1.inst1`
`539`	`db2-db.cluster1.inst1.optimizer-sdb`
`540`	`db2-db.cluster1.inst1.predict`
`541`	`jdbc-wsapp-main-predict.cluster1`
`542`	`predict.cluster1.inst1`
`543`	`ws1.predict.cluster1.inst1`
`544`	`db2-db.cluster1.inst1.predict-sdb`
`551`	`addons.cluster1.inst1`
`600`	`application-admin-rbac.cluster1.inst1`
`600`	`postsyncjobs.cluster1.inst1`

Case B: Monitor and IoT channel `< 9.2` (IoT first)

Wave	Application
`0`	`syncres.cluster1.inst1`
`10`	`syncjobs.cluster1.inst1`
`110`	`db2u.cluster1.inst1`
`120`	`db2-db.cluster1.inst1.manage`
`130`	`jdbc-wsapp-main-manage.cluster1`
`130`	`suite.cluster1.inst1`
`190`	`aicfg.cluster1`
`200`	`ws1.suite.cluster1.inst1`
`502`	`manage.cluster1.inst1`
`503`	`ws1.manage.cluster1.inst1`
`504`	`db2-db.cluster1.inst1.manage-sdb`
`505`	`db2-db.cluster1.inst1.facilities`
`506`	`jdbc-wsapp-main-facilities.cluster1`
`507`	`facilities.cluster1.inst1`
`508`	`ws1.facilities.cluster1.inst1`
`509`	`db2-db.cluster1.inst1.facilities-sdb`
`510`	`db2-db.cluster1.inst1.iot`
`511`	`jdbc-wsapp-main-iot.cluster1`
`512`	`iot.cluster1.inst1`
`513`	`ws1.iot.cluster1.inst1`
`514`	`db2-db.cluster1.inst1.iot-sdb`
`515`	`db2-db.cluster1.inst1.monitor`
`516`	`jdbc-wsapp-main-monitor.cluster1`
`517`	`monitor.cluster1.inst1`
`518`	`ws1.monitor.cluster1.inst1`
`519`	`db2-db.cluster1.inst1.monitor-sdb`
`520`	`db2-db.cluster1.inst1.health`
`521`	`jdbc-wsapp-main-health.cluster1`
`522`	`health.cluster1.inst1`
`523`	`ws1.health.cluster1.inst1`
`524`	`db2-db.cluster1.inst1.health-sdb`
`525`	`db2-db.cluster1.inst1.assist`
`526`	`jdbc-wsapp-main-assist.cluster1`
`527`	`assist.cluster1.inst1`
`528`	`ws1.assist.cluster1.inst1`
`529`	`db2-db.cluster1.inst1.assist-sdb`
`530`	`db2-db.cluster1.inst1.visualinspection`
`531`	`jdbc-wsapp-main-visualinspection.cluster1`
`532`	`visualinspection.cluster1.inst1`
`533`	`ws1.visualinspection.cluster1.inst1`
`534`	`db2-db.cluster1.inst1.visualinspection-sdb`
`535`	`db2-db.cluster1.inst1.optimizer`
`536`	`jdbc-wsapp-main-optimizer.cluster1`
`537`	`optimizer.cluster1.inst1`
`538`	`ws1.optimizer.cluster1.inst1`
`539`	`db2-db.cluster1.inst1.optimizer-sdb`
`540`	`db2-db.cluster1.inst1.predict`
`541`	`jdbc-wsapp-main-predict.cluster1`
`542`	`predict.cluster1.inst1`
`543`	`ws1.predict.cluster1.inst1`
`544`	`db2-db.cluster1.inst1.predict-sdb`
`551`	`addons.cluster1.inst1`
`600`	`application-admin-rbac.cluster1.inst1`
`600`	`postsyncjobs.cluster1.inst1`

Verification against the block table

Check	Case A (`>= 9.2`)	Case B (`< 9.2`)
Manage PDB stays at `120`, then install `502`, config `503`, SDB `504`	pass	pass
Facilities block `505`-`509` (PDB, JDBC, install, config, SDB)	pass	pass
First of Monitor/IoT block `510`-`514`	Monitor	IoT
Second of Monitor/IoT block `515`-`519`	IoT	Monitor
Health `520`-`524`, Assist `525`-`529`, Visual Inspection `530`-`534`, Optimizer `535`-`539`, Predict `540`-`544`	pass	pass
In-cluster Db2 JDBC config of non-Manage apps sits at PDB + 1 (`506`, `511`, `516`, ...)	pass	pass
Manage JDBC config stays at `130`, `aicfg` at `190`, workspaces at `200`	pass	pass
Addons config `551`, RBAC and post-sync jobs `600` run after every block	pass	pass

This instance test20414 is created to check the sync-wave ordering for various apps. This instance has all the applications deployed successfully,

This reverts commit a38042c.

PDB (120) -> Manage install (500) -> Manage config (502) -> SDB (504) -> other apps (505+)

svt01 · 2026-11-09T05:45:37Z

instanceId: test20414

This instance is created to check the sync-wave ordering for various apps. This instance has all the applications deployed successfully,

svt01 · 2026-11-09T05:47:33Z

Side-by-Side Comparison: `main` vs `fix-sync-order-adjustment-v3`

"Default (0)" means the template has no argocd.argoproj.io/sync-wave annotation. Rows marked changed are the ones to port. IoT and Monitor depend on the MAS channel (< 9.2 or >= 9.2).

Db2 PDB -> App JDBC config -> App install -> App workspace config -> Db2 SDB, then the next application's block.

4.1 Root applications (`root-applications/ibm-mas-instance-root/templates/`)

Application	Template	`main`	`fix-sync-order-adjustment-v3`	Status
Manage Db2, PDB	`120-db2-databases-app.yaml`	`120`	`120`	unchanged
Manage Db2, SDB	`120-db2-databases-app.yaml`	`121`	`504`	changed
Facilities Db2, PDB	`120-db2-databases-app.yaml`	`120`	`505`	changed
Facilities Db2, SDB	`120-db2-databases-app.yaml`	`121`	`509`	changed
Monitor Db2, PDB	`120-db2-databases-app.yaml`	`120`	`510` (>= 9.2) / `515` (< 9.2)	changed
Monitor Db2, SDB	`120-db2-databases-app.yaml`	`121`	`514` (>= 9.2) / `519` (< 9.2)	changed
IoT Db2, PDB	`120-db2-databases-app.yaml`	`120`	`515` (>= 9.2) / `510` (< 9.2)	changed
IoT Db2, SDB	`120-db2-databases-app.yaml`	`121`	`519` (>= 9.2) / `514` (< 9.2)	changed
Health / Assist / VI / Optimizer / Predict Db2, PDB	`120-db2-databases-app.yaml`	`120`	`520` / `525` / `530` / `535` / `540`	changed
Health / Assist / VI / Optimizer / Predict Db2, SDB	`120-db2-databases-app.yaml`	`121`	`524` / `529` / `534` / `539` / `544`	changed
Db2 for an unknown app id, PDB / SDB	`120-db2-databases-app.yaml`	`120` / `121`	`120` / `549`	changed (SDB)
Suite configs, `ibm-mas-aicfg-config`	`130-ibm-mas-suite-configs-app.yaml`	`190`	`190`	unchanged
Suite configs, all others	`130-ibm-mas-suite-configs-app.yaml`	`130`	`130`	unchanged
Suite configs, JDBC of non-Manage app, `incluster-db2`	`130-ibm-mas-suite-configs-app.yaml`	`130`	app `jdbc` wave (`506`, `511`, ...)	changed
Manage install	`500-ibm-mas-masapp-manage-install.yaml`	`500`	`502`	changed
Manage config	`510-550-ibm-mas-masapp-configs.yaml`	`510`	`503`	changed
Facilities install	`505-ibm-mas-masapp-facilities-install.yaml`	`505`	`507`	changed
Facilities config	`510-550-ibm-mas-masapp-configs.yaml`	`510`	`508`	changed
Assist install	`510-ibm-mas-masapp-assist-install.yaml`	`510`	`527`	changed
Assist config	`510-550-ibm-mas-masapp-configs.yaml`	`515`	`528`	changed
Visual Inspection install	`510-ibm-mas-masapp-visualinspection-install.yaml`	`510`	`532`	changed
Visual Inspection config	`510-550-ibm-mas-masapp-configs.yaml`	`515`	`533`	changed
IoT install, channel < 9.2	`510-ibm-mas-masapp-iot-install.yaml`	`510`	`512`	changed
IoT install, channel >= 9.2	`510-ibm-mas-masapp-iot-install.yaml`	`520`	`517`	changed
IoT config, channel < 9.2	`510-550-ibm-mas-masapp-configs.yaml`	`515`	`513`	changed
IoT config, channel >= 9.2	`510-550-ibm-mas-masapp-configs.yaml`	`530`	`518`	changed
Health install	`520-ibm-mas-masapp-health-install.yaml`	`520`	`522`	changed
Health config	`510-550-ibm-mas-masapp-configs.yaml`	`530`	`523`	changed
Monitor install, channel < 9.2	`520-ibm-mas-masapp-monitor-install.yaml`	`520`	`517`	changed
Monitor install, channel >= 9.2	`520-ibm-mas-masapp-monitor-install.yaml`	`510`	`512`	changed
Monitor config, channel < 9.2	`510-550-ibm-mas-masapp-configs.yaml`	`530`	`518`	changed
Monitor config, channel >= 9.2	`510-550-ibm-mas-masapp-configs.yaml`	`515`	`513`	changed
Optimizer install	`520-ibm-mas-masapp-optimizer-install.yaml`	`520`	`537`	changed
Optimizer config	`510-550-ibm-mas-masapp-configs.yaml`	`530`	`538`	changed
Predict install	`540-ibm-mas-masapp-predict-install.yaml`	`540`	`542`	changed
Predict config	`510-550-ibm-mas-masapp-configs.yaml`	`550`	`543`	changed
Addons config	`550-ibm-mas-addons-config.yaml`	`551`	`551`	unchanged
Application admin RBAC	`600-application-admin-rbac-app.yaml`	`600`	`600`	unchanged
Post-sync jobs	`600-ibm-post-sync-jobs.yaml`	`600`	`600`	unchanged

The >= 9.2 / < 9.2 Monitor and IoT waves above assume both apps are on the same side of the 9.2 split. If either channel is >= 9.2, the helper uses the >= 9.2 ordering for both.

svt01 · 2026-11-09T05:52:16Z

Block base waves

The helper assigns each application a base wave. Within a block: PDB = base, JDBC config = base + 1, install = base + 2, config = base + 3, SDB = base + 4.

Block position	Application	Base	PDB	JDBC config	Install	Config	SDB
1	Manage	`500`	`120` (pinned)	-	`502`	`503`	`504`
2	Facilities	`505`	`505`	`506`	`507`	`508`	`509`
3	Monitor (>= 9.2) or IoT (< 9.2)	`510`	`510`	`511`	`512`	`513`	`514`
4	IoT (>= 9.2) or Monitor (< 9.2)	`515`	`515`	`516`	`517`	`518`	`519`
5	Health	`520`	`520`	`521`	`522`	`523`	`524`
6	Assist	`525`	`525`	`526`	`527`	`528`	`529`
7	Visual Inspection	`530`	`530`	`531`	`532`	`533`	`534`
8	Optimizer	`535`	`535`	`536`	`537`	`538`	`539`
9	Predict	`540`	`540`	`541`	`542`	`543`	`544`
-	Any other `mas_application_id` with a Db2 database	-	`120`	-	-	-	`549`

Sagar-Talikoti and others added 30 commits August 26, 2026 14:47

raise sync-wave priority for Manage over other apps

25d48ee

fix: set sync-wave order for SDB and Backup job

dc834e5

Merge branch 'main' into fix-sync-order-adjustment

3cfabbb

fix: update sync-wave for 04-db2u-Backup_Cron.yaml

60f2758

Merge branch 'main' into fix-sync-order-adjustment

6768109

Merge branch 'main' into fix-sync-order-adjustment

a42f4a5

Merge branch 'main' into fix-sync-order-adjustment

1eeb6b8

update to sync-wave

1360db6

fix: update

853538e

fix: updates

19e5022

update for co-wave grouping

886a105

Merge branch 'main' into fix-sync-order-adjustment-v2

90865c8

Merge branch 'main' into fix-sync-order-adjustment-v2

ba93cb4

Merge branch 'main' into fix-sync-order-adjustment-v2

df793f0

Merge branch 'main' into fix-sync-order-adjustment-v2

734a5f8

Merge branch 'main' into fix-sync-order-adjustment-v2

e2107f8

Merge branch 'main' into fix-sync-order-adjustment-v2

453569a

Merge branch 'main' into fix-sync-order-adjustment-v2

5dac987

Merge branch 'main' into fix-sync-order-adjustment-v3

80243cc

update the sync wave for secondary db

4db8ab3

Merge branch 'main' into fix-sync-order-adjustment-v3

bfa8a21

Merge branch 'main' into fix-sync-order-adjustment-v3

945e3ae

Merge branch 'main' into fix-sync-order-adjustment-v3

21eaed6

update the sync-waves

f5576a1

include presync hook for sdb

a38042c

Revert "include presync hook for sdb"

fe1682a

This reverts commit a38042c.

delete 00-presync-await-crd_Job.yaml

e0fef99

Merge branch 'main' into fix-sync-order-adjustment-v3

da09923

changes

1395c7f

Merge branch 'main' into fix-sync-order-adjustment-v3

4f9baec

Sagar-Talikoti added 6 commits October 30, 2026 16:45

update for 00-presync-await-crd

266d297

prioritise manage

92e7149

PDB (120) -> Manage install (500) -> Manage config (502) -> SDB (504) -> other apps (505+)

Merge branch 'main' into fix-sync-order-adjustment-v3

3bd15fa

per-app block changes

8b0d401

update 130-ibm-mas-suite-configs-app.yaml

9e59b06

update

91309d2

svt01 marked this pull request as ready for review November 9, 2026 05:47

svt01 self-assigned this Nov 9, 2026

svt01 requested review from rbinns and whitfiea November 9, 2026 07:48

whitfiea changed the title ~~fix sync order adjustment v3~~ [minor] fix sync order adjustment v3 Nov 9, 2026

whitfiea approved these changes Nov 9, 2026

View reviewed changes

Merge branch 'main' into fix-sync-order-adjustment-v3

22a6fd7

sumitjain-1901 approved these changes Nov 11, 2026

View reviewed changes

Merge branch 'main' into fix-sync-order-adjustment-v3

9ef335b

mnivedithaa approved these changes Nov 13, 2026

View reviewed changes

mnivedithaa merged commit 9d3d1ba into main Nov 13, 2026
3 checks passed

mnivedithaa deleted the fix-sync-order-adjustment-v3 branch November 13, 2026 09:31

Navigation Menu

Repository navigation

[minor] fix sync order adjustment v3 - #626

[minor] fix sync order adjustment v3#626
mnivedithaa merged 38 commits into
mainfrom
fix-sync-order-adjustment-v3

svt01 commented Oct 1, 2026 •

edited

Loading

Uh oh!

svt01 commented Nov 9, 2026

Uh oh!

svt01 commented Nov 9, 2026

Uh oh!

svt01 commented Nov 9, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

svt01 commented Oct 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issues

How Has This Been Tested?

1. Static checks (helm-lint.sh)

./build/bin/helm-lint.sh -p root-applications/ibm-mas-instance-root

./build/bin/helm-lint.sh -p instance-applications/120-ibm-db2u-database

2. Rendered sync-wave order

Case A: Monitor or IoT channel >= 9.2 (Monitor first)

Case B: Monitor and IoT channel < 9.2 (IoT first)

Verification against the block table

Uh oh!

svt01 commented Nov 9, 2026

instanceId: test20414

Uh oh!

svt01 commented Nov 9, 2026

Side-by-Side Comparison: main vs fix-sync-order-adjustment-v3

4.1 Root applications (root-applications/ibm-mas-instance-root/templates/)

Uh oh!

svt01 commented Nov 9, 2026

Block base waves

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

svt01 commented Oct 1, 2026 •

edited

Loading

1. Static checks (`helm-lint.sh`)

`./build/bin/helm-lint.sh -p root-applications/ibm-mas-instance-root`

`./build/bin/helm-lint.sh -p instance-applications/120-ibm-db2u-database`

Case A: Monitor or IoT channel `>= 9.2` (Monitor first)

Case B: Monitor and IoT channel `< 9.2` (IoT first)

Side-by-Side Comparison: `main` vs `fix-sync-order-adjustment-v3`

4.1 Root applications (`root-applications/ibm-mas-instance-root/templates/`)