Skip to content

[patch] updated sync wave logic for mas_app_channel version >= 9.2 #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
prajeshjain wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

[patch] updated sync wave logic for mas_app_channel version >= 9.2 #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
222f883
[patch] updated sync wave logic for mas_app_channel version >= 9.2
Apr 8, 2026
8a3ca81
sync wave changes
Apr 12, 2026
6523459
Merge branch 'main' into monitor9.2-gitops
Apr 12, 2026
2f32703
Merge remote-tracking branch 'origin/monitor9.2-gitops' into MASCORE-…
Apr 12, 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/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ spec:
# 1. Admin users: We CREATE these with DBADM (for schema management)

# Validate MAS_APP_ID
valid_apps = ['manage', 'facilities', 'iot']
valid_apps = ['manage', 'facilities', 'iot', 'monitor']
if mas_app_id not in valid_apps:
print(f"Unknown MAS_APP_ID: {mas_app_id}")
sys.exit(1)
Expand Down
8 changes: 8 additions & 0 deletions root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,23 @@ metadata:
{{- else if eq $value.mas_app_id "facilities" }}
argocd.argoproj.io/sync-wave: "510"
{{- else if eq $value.mas_app_id "iot" }}
{{- if and $.Values.ibm_suite_app_iot_install (regexMatch "^9\\.(2|[3-9]|[1-9][0-9])\\..*" $.Values.ibm_suite_app_iot_install.mas_app_channel) }}
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 and $.Values.ibm_suite_app_monitor_install (regexMatch "^9\\.(2|[3-9]|[1-9][0-9])\\..*" $.Values.ibm_suite_app_monitor_install.mas_app_channel) }}
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" }}
Expand Down
2 changes: 1 addition & 1 deletion root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
instance: '{{ .Values.instance.id }}'
masapp: 'iot'
annotations:
argocd.argoproj.io/sync-wave: "510"
argocd.argoproj.io/sync-wave: "{{- 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 }}{{- if or (gt $major 9) (and (eq $major 9) (ge $minor 2)) }}520{{- else }}510{{- end }}{{- else }}510{{- end }}{{- else }}510{{- 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
2 changes: 1 addition & 1 deletion root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
instance: '{{ .Values.instance.id }}'
masapp: 'monitor'
annotations:
argocd.argoproj.io/sync-wave: "520"
argocd.argoproj.io/sync-wave: "{{- 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 }}{{- if $version }}{{- $parts := splitList "." $version }}{{- $major := index $parts 0 | int }}{{- $minor := index $parts 1 | int }}{{- if or (gt $major 9) (and (eq $major 9) (ge $minor 2)) }}510{{- else }}520{{- end }}{{- else }}520{{- end }}{{- else }}520{{- 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
Loading