[minor] Add manage update schedule

ibm-mas · Dec 5, 2024 · 529571d · 529571d
1 parent 16208c3
commit 529571d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/image/cli/mascli/functions/gitops_suite_app_config b/image/cli/mascli/functions/gitops_suite_app_config
@@ -57,7 +57,7 @@ Maximo Manage:
       masdev-manage-d-sbNascsn: <<base64 encoded content of masdev-manage-dsbNasc-sn.xml>>
 
   --mas-app-global-secrets-yaml ${COLOR_YELLOW}MAS_APP_GLOBAL_SECRETS_YAML${TEXT_RESET} yaml file location containing secret key/values that will be added to the Manage encryption secret
-
+  --manage-update-schedule ${COLOR_YELLOW}MANAGE_UPDATE_SCHEDULE${TEXT_RESET} cron based schedule to indicate when manage will do the offline update when the onlineUpgrade is set in the ManageWorkspace CR. Optional as default is  "0 0 * * *"
 
 Secrets Manager:
   --secrets-path ${COLOR_YELLOW}SECRETS_PATH${TEXT_RESET}                                                 Secrets Manager path
@@ -183,6 +183,9 @@ function gitops_suite_app_config_noninteractive() {
       --mas-app-global-secrets-yaml)
         export MAS_APP_GLOBAL_SECRETS_YAML=$1 && shift
         ;;
+      --manage-update-schedule)
+        export MANAGE_UPDATE_SCHEDULE=$1 && shift
+        ;;
 
       # Automatic GitHub Push
       -P|--github-push)
@@ -331,6 +334,7 @@ function gitops_suite_app_config() {
   echo_reset_dim "Application WS Spec Yaml file ........... ${COLOR_MAGENTA}${MAS_APPWS_SPEC_YAML}"
   echo_reset_dim "Combined additional server configs ...... ${COLOR_MAGENTA}${MAS_APP_SERVER_BUNDLES_COMBINED_ADD_SERVER_CONFIG_YAML}"
   echo_reset_dim "Global Secrets (Manage) ................. ${COLOR_MAGENTA}${MAS_APP_GLOBAL_SECRETS_YAML}"
+  echo_reset_dim "Manage Update Schedule  ................. ${COLOR_MAGENTA}${MANAGE_UPDATE_SCHEDULE}"
 
   if [[ -n "$MAS_APPWS_SPEC_YAML" ]] && [[ -s "$MAS_APPWS_SPEC_YAML" ]]; then
     echo_reset_dim "Using Default Application Spec ........ ${COLOR_MAGENTA}False"

diff --git a/...cli/templates/gitops/appset-configs/cluster/instance/masapp/ibm-mas-masapp-config.yaml.j2 b/...cli/templates/gitops/appset-configs/cluster/instance/masapp/ibm-mas-masapp-config.yaml.j2
@@ -27,6 +27,10 @@ manage_logging_access_secret_key: <path:{{ SECRETS_PATH }}:{{ MANAGE_LOGGING_SEC
 {{ MAS_APP_GLOBAL_SECRETS | indent(2) }}
 {%- endif %}
 
+{%- if MANAGE_UPDATE_SCHEDULE is defined and MANAGE_UPDATE_SCHEDULE !='' %}
+manage_update_schedule: {{ MANAGE_UPDATE_SCHEDULE }}
+{%- endif %}
+
 {{ MAS_APPWS_SPEC | indent(2) }}
 
 {% if MAS_MANUAL_CERT_MGMT == 'true' %}

diff --git a/tekton/src/pipelines/gitops/gitops-mas-apps.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-apps.yml.j2
@@ -355,6 +355,9 @@ spec:
     - name: mas_app_global_secrets_yaml_manage
       type: string
       default: ""
+    - name: manage_update_schedule
+      type: string
+      default: ""
 
     - name: mas_app_channel_monitor
       type: string

diff --git a/tekton/src/pipelines/taskdefs/gitops/apps/manage-workspace.yml.j2 b/tekton/src/pipelines/taskdefs/gitops/apps/manage-workspace.yml.j2
@@ -42,6 +42,8 @@
       value: $(params.ingress)
     - name: run_sanity_test
       value: $(params.run_sanity_test)
+    - name: manage_update_schedule
+      value: $(params.manage_update_schedule)
   taskRef:
     name: gitops-suite-app-config
     kind: Task

diff --git a/tekton/src/tasks/gitops/gitops-suite-app-config.yml.j2 b/tekton/src/tasks/gitops/gitops-suite-app-config.yml.j2
@@ -76,6 +76,9 @@ spec:
     - name: run_sanity_test
       type: string
       default: "false"
+    - name: manage_update_schedule
+      type: string
+      default: ""
 
   stepTemplate:
     name: gitops-suite-app-config
@@ -136,6 +139,8 @@ spec:
         value: $(params.ingress)
       - name: RUN_SANITY_TEST
         value: $(params.run_sanity_test)
+      - name: MANAGE_UPDATE_SCHEDULE
+        value: $(params.manage_update_schedule)
     envFrom:
       - configMapRef:
           name: environment-properties