mas-cli 13.25.0__py3-none-any.whl → 13.26.0__py3-none-any.whl

mas/cli/templates/ibm-mas-tekton.yaml

@@ -231,7 +231,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aibroker
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/appconnect.yaml
@@ -342,7 +342,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -460,7 +460,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -530,7 +530,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -596,7 +596,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -723,7 +723,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -843,7 +843,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -960,7 +960,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1066,7 +1066,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1388,7 +1388,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1498,7 +1498,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -1587,7 +1587,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1691,7 +1691,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1773,7 +1773,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2078,7 +2078,7 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2186,7 +2186,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2334,7 +2334,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2463,7 +2463,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2754,7 +2754,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2852,7 +2852,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2979,7 +2979,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3077,7 +3077,7 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -3169,7 +3169,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3254,7 +3254,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3339,7 +3339,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3458,7 +3458,7 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3551,7 +3551,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -3634,7 +3634,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -3751,7 +3751,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -3861,7 +3861,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3964,7 +3964,7 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -4021,7 +4021,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4226,7 +4226,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -4324,7 +4324,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4416,7 +4416,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4628,7 +4628,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4721,7 +4721,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4812,7 +4812,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4905,7 +4905,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -5018,7 +5018,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5145,7 +5145,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -5280,7 +5280,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -5376,7 +5376,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -5498,7 +5498,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5624,7 +5624,7 @@ spec:
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: shared-entitlement
 
@@ -6343,7 +6343,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -6836,7 +6836,140 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
+  workspaces:
+    - name: configs
+# --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/tasks/gitops-mas-provisioner.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: gitops-mas-provisioner
+spec:
+  params:
+    - name: cluster_name
+      type: string
+    - name: account
+      type: string
+    - name: cluster_url
+      type: string
+      default: ""
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: provisioner_namespace
+      type: string
+    - name: provisioner_version
+      type: string
+    - name: provisioner_domain
+      type: string
+    - name: enable_mtls
+      type: string
+    - name: enable_pd_alert
+      type: string
+    - name: enable_ocm_alert
+      type: string
+    - name: base_branch
+      type: string
+    - name: status_repo_url
+      type: string
+    - name: async_poll_interval
+      type: string
+    - name: async_poll_max
+      type: string
+    - name: account_alias
+      type: string
+    - name: service_port
+      type: string
+
+  stepTemplate:
+    name: gitops-mas-provisioner
+    env:
+      - name: CLUSTER_NAME
+        value: $(params.cluster_name)
+      - name: ACCOUNT
+        value: $(params.account)
+      - name: CLUSTER_URL
+        value: $(params.cluster_url)
+      - name: GITHUB_REPO
+        value: $(params.github_repo)
+      - name: SECRET_PATH
+        value: $(params.secrets_path)
+      - name: GIT_BRANCH
+        value: $(params.git_branch)
+      - name: GITHUB_ORG
+        value: $(params.github_org)
+      - name: GITHUB_HOST
+        value: $(params.github_host)
+      - name: GITHUB_REPO
+        value: $(params.github_repo)
+      - name: SM_AWS_REGION
+        value: $(params.avp_aws_secret_region)
+      - name: PROVISIONER_NAMESPACE
+        value: $(params.provisioner_namespace)
+      - name: PROVISIONER_VERSION
+        value: $(params.provisioner_version)
+      - name: PROVISIONER_DOMAIN
+        value: $(params.provisioner_domain)
+      - name: STATUS_REPO_URL
+        value: $(params.status_repo_url)
+      - name: BASE_BRANCH
+        value: $(params.base_branch)
+      - name: ACCOUNT_ALIAS
+        value: $(params.account_alias)
+      - name: ENABLE_MTLS
+        value: $(params.enable_mtls)
+      - name: ENABLE_PD_ALERT
+        value: $(params.enable_pd_alert)
+      - name: ENABLE_OCM_ALERT
+        value: $(params.enable_ocm_alert)
+      - name: SERVICE_PORT
+        value: $(params.service_port)
+      - name: ASYNC_POLL_INTERVAL
+        value: $(params.async_poll_interval)
+      - name: ASYNC_POLL_MAX
+        value: $(params.async_poll_max)
+    envFrom:
+      - configMapRef:
+          name: environment-properties
+          optional: true
+      - secretRef:
+          name: secure-properties
+  steps:
+    - args:
+      - |-
+        git config --global user.name "MAS Automation"
+        git config --global user.email "you@example.com"
+        git config --global user.password $GITHUB_PAT
+        
+        mkdir -p /tmp/init-mas-provisioner
+        mas gitops-mas-provisioner -a $ACCOUNT -c $CLUSTER_NAME \
+        --dir /tmp/init-mas-provisioner \
+        --secrets-path $SECRET_PATH \
+        --github-push \
+        --github-host $GITHUB_HOST \
+        --github-org $GITHUB_ORG \
+        --github-repo $GITHUB_REPO \
+        --git-branch $GIT_BRANCH
+
+        exit $?
+      command:
+        - /bin/sh
+        - -c
+      name: gitops-mas-provisioner
+      imagePullPolicy: IfNotPresent
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6944,7 +7077,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -7070,7 +7203,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7188,7 +7321,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7244,7 +7377,7 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7431,7 +7564,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7589,7 +7722,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7695,7 +7828,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: certificates
@@ -7870,7 +8003,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7970,7 +8103,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 
@@ -8094,7 +8227,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -8195,7 +8328,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8617,7 +8750,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8737,7 +8870,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8839,7 +8972,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -9182,7 +9315,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -9232,7 +9365,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9366,7 +9499,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -9608,7 +9741,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9824,7 +9957,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kmodels
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
@@ -10002,7 +10135,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10045,7 +10178,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -10162,7 +10295,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10198,7 +10331,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10240,7 +10373,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10282,7 +10415,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10324,7 +10457,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10366,7 +10499,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10492,7 +10625,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -10560,7 +10693,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10796,7 +10929,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - odh
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -10972,7 +11105,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11242,10 +11375,6 @@ spec:
       type: string
       description: Define storage mode for log
       default: ""
-    # - name: mas_ws_facilities_storage_log_size
-    #   description: Define storage size for log
-    #   type: string
-    #   default: ""
     - name: mas_ws_facilities_storage_userfiles_class
       type: string
       description: Define storage class for userfiles
@@ -11254,19 +11383,10 @@ spec:
       type: string
       description: Define storage mode for userfiles
       default: ""
-    # - name: mas_ws_facilities_storage_userfiles_size
-    #   description: Define storage size for userfiles
-    #   type: string
-    #   default: ""
-    # - name: mas_ws_facilities_dwfagents
-    #   type: array
-    #   description: Define a list of dedicated workflow agents
-    #   default: []
-    # - name: mas_ws_facilities_db_maxconnpoolsize
-    #   description: Define maximum connection pool size
-    #   type: string
-    #   default: ""
-
+    - name: mas_ws_facilities_config_map_name
+      type: string
+      description: ConfigMap with configurations not supported by Tekton
+      default: ""
     # Custom Label Support
     - name: custom_labels
       type: string
@@ -11429,18 +11549,12 @@ spec:
         value: $(params.mas_ws_facilities_storage_log_class)
       - name: MAS_FACILITIES_STORAGE_LOG_MODE
         value: $(params.mas_ws_facilities_storage_log_mode)
-      # - name: MAS_FACILITIES_STORAGE_LOG_SIZE
-      #   value: $(params.mas_ws_facilities_storage_log_size)
       - name: MAS_FACILITIES_STORAGE_USERFILES_CLASS
         value: $(params.mas_ws_facilities_storage_userfiles_class)
       - name: MAS_FACILITIES_STORAGE_USERFILES_MODE
         value: $(params.mas_ws_facilities_storage_userfiles_mode)
-      # - name: MAS_FACILITIES_STORAGE_USERFILES_SIZE
-      #   value: $(params.mas_ws_facilities_storage_userfiles_size)
-      # - name: MAS_FACILITIES_DWFAGENTS
-      #   value: $(params.mas_ws_facilities_dwfagents)
-      # - name: MAS_FACILITIES_DB_MAX_POOLSIZE
-      #   value: $(params.mas_ws_facilities_db_maxconnpoolsize)
+      - name: MAS_FACILITIES_CONFIG_MAP_NAME
+        value: $(params.mas_ws_facilities_config_map_name)
 
       # Custom Label Support
       - name: CUSTOM_LABELS
@@ -11451,12 +11565,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -11651,7 +11765,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -11740,7 +11854,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -11803,7 +11917,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -11878,7 +11992,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -11979,7 +12093,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -12122,7 +12236,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -12189,7 +12303,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -12521,7 +12635,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_facilities
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
     
@@ -12593,7 +12707,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -12783,7 +12897,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -13032,7 +13146,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -13120,7 +13234,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -13185,7 +13299,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -13255,7 +13369,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -13317,12 +13431,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-suite-verify exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: suite-post-verify
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -13445,7 +13559,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -13526,7 +13640,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -13589,7 +13703,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -13675,7 +13789,7 @@ spec:
       description: "The value to set"
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -13722,7 +13836,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -13803,7 +13917,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -13863,7 +13977,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:13.25.0
+      image: quay.io/ibmmas/cli:13.26.0
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -20332,6 +20446,43 @@ spec:
       type: string
       default: ''
 
+    - name: provisioner_namespace
+      type: string
+      default: 'mas-provisioner'
+    - name: provisioner_version
+      type: string
+      default: ''
+    - name: provisioner_domain
+      type: string
+      default: ''
+    - name: provisioner_status_repo_url
+      type: string
+      default: ''
+    - name: provisioner_base_branch
+      type: string
+      default: ''
+    - name: provisioner_service_port
+      type: string
+      default: ''
+    - name: provisioner_account_alias
+      type: string
+      default: ''
+    - name: provisioner_enable_mtls
+      type: string
+      default: ''
+    - name: provisioner_enable_pd_alert
+      type: string
+      default: ''
+    - name: provisioner_enable_ocm_alert
+      type: string
+      default: ''
+    - name: provisioner_async_poll_interval
+      type: string
+      default: ''
+    - name: provisioner_async_poll_max
+      type: string
+      default: ''
+
   tasks:
     - name: gitops-cluster
       params:
@@ -20571,6 +20722,65 @@ spec:
         - input: "$(params.nvidia_gpu_action)"
           operator: in
           values: ["install"]
+
+    - name: gitops-mas-provisioner
+      runAfter:
+        - gitops-cluster
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: account
+          value: $(params.account)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: git_branch
+          value: $(params.git_branch)
+        - name: github_org
+          value: $(params.github_org)
+        - name: github_repo
+          value: $(params.github_repo)
+        - name: github_host
+          value: $(params.github_host)
+        - name: git_commit_msg
+          value: $(params.git_commit_msg)
+        - name: provisioner_namespace
+          value: $(params.provisioner_namespace)
+        - name: provisioner_version
+          value: $(params.provisioner_version)
+        - name: provisioner_domain
+          value: $(params.provisioner_domain)
+        - name: status_repo_url
+          value: $(params.provisioner_status_repo_url)
+        - name: base_branch
+          value: $(params.provisioner_base_branch)
+        - name: service_port
+          value: $(params.provisioner_service_port)
+        - name: account_alias
+          value: $(params.provisioner_account_alias)
+        - name: async_poll_interval
+          value: $(params.provisioner_async_poll_interval)
+        - name: async_poll_max
+          value: $(params.provisioner_async_poll_max)
+        - name: enable_mtls
+          value: $(params.provisioner_enable_mtls)
+        - name: enable_ocm_alert
+          value: $(params.provisioner_enable_ocm_alert)
+        - name: enable_pd_alert
+          value: $(params.provisioner_enable_pd_alert)
+      taskRef:
+        kind: Task
+        name: gitops-mas-provisioner
+      workspaces:
+        - name: configs
+          workspace: configs
+      when:
+        - input: "$(params.provisioner_status_repo_url)"
+          operator: notin
+          values: [""]
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-deps-after-provision.yaml
 # --------------------------------------------------------------------------------
@@ -23969,9 +24179,6 @@ spec:
       type: string
       description: Define storage mode for log
       default: ""
-    # - name: mas_ws_facilities_storage_log_size
-    #   description: Define storage size for log
-    #   type: integer
     - name: mas_ws_facilities_storage_userfiles_class
       type: string
       description: Define storage class for userfiles
@@ -23980,16 +24187,10 @@ spec:
       type: string
       description: Define storage mode for userfiles
       default: ""
-    # - name: mas_ws_facilities_storage_userfiles_size
-    #   description: Define storage size for userfiles
-    #   type: integer
-    # - name: mas_ws_facilities_dwfagents
-    #   type: array
-    #   description: Define a list of dedicated workflow agents
-    #   default: []
-    # - name: mas_ws_facilities_db_maxconnpoolsize
-    #   description: Define maximum connection pool size
-    #   type: integer
+    - name: mas_ws_facilities_config_map_name
+      description: ConfigMap with configurations not supported by Tekton
+      type: string
+      default: ""
 
   tasks:
     # Content
@@ -26698,18 +26899,12 @@ spec:
           value: $(params.mas_ws_facilities_storage_log_class)
         - name: mas_ws_facilities_storage_log_mode
           value: $(params.mas_ws_facilities_storage_log_mode)
-        # - name: mas_ws_facilities_storage_log_size
-        #   value: $(params.mas_ws_facilities_storage_log_size)
         - name: mas_ws_facilities_storage_userfiles_class
           value: $(params.mas_ws_facilities_storage_userfiles_class)
         - name: mas_ws_facilities_storage_userfiles_mode
           value: $(params.mas_ws_facilities_storage_userfiles_mode)
-        # - name: mas_ws_facilities_storage_userfiles_size
-        #   value: $(params.mas_ws_facilities_storage_userfiles_size)
-        # - name: mas_ws_facilities_dwfagents
-        #   value: "$(params.mas_ws_facilities_dwfagents)"
-        # - name: mas_ws_facilities_db_maxconnpoolsize
-        #   value: $(params.mas_ws_facilities_db_maxconnpoolsize)
+        - name: mas_ws_facilities_config_map_name
+          value: $(params.mas_ws_facilities_config_map_name)
 
         # Custom Label Support
         - name: custom_labels
@@ -29658,9 +29853,6 @@ spec:
       type: string
       description: Define storage mode for log
       default: ""
-    # - name: mas_ws_facilities_storage_log_size
-    #   description: Define storage size for log
-    #   type: integer
     - name: mas_ws_facilities_storage_userfiles_class
       type: string
       description: Define storage class for userfiles
@@ -29669,16 +29861,10 @@ spec:
       type: string
       description: Define storage mode for userfiles
       default: ""
-    # - name: mas_ws_facilities_storage_userfiles_size
-    #   description: Define storage size for userfiles
-    #   type: integer
-    # - name: mas_ws_facilities_dwfagents
-    #   type: array
-    #   description: Define a list of dedicated workflow agents
-    #   default: []
-    # - name: mas_ws_facilities_db_maxconnpoolsize
-    #   description: Define maximum connection pool size
-    #   type: integer
+    - name: mas_ws_facilities_config_map_name
+      description: ConfigMap with configurations not supported by Tekton
+      type: string
+      default: ""
 
     # 3. Upgrade
     # -------------------------------------------------------------------------
@@ -30352,47 +30538,48 @@ spec:
       runAfter:
         - app-manage-upgrade
 
-    # 10. Predict Upgrade (Phase 5 - after Manage)
+    # 10. Monitor Upgrade (Phase 6 - after IoT)
     # -------------------------------------------------------------------------
-    - name: app-predict-upgrade
+    - name: app-monitor-upgrade
       timeout: "0"
       params:
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: predict
+          value: monitor
         - name: mas_app_channel
-          value: $(params.mas_app_channel_predict)
+          value: $(params.mas_app_channel_monitor)
         - name: skip_compatibility_check
           value: $(params.skip_compatibility_check)
         - name: devops_suite_name
-          value: app-predict-upgrade
+          value: app-monitor-upgrade
       taskRef:
         kind: Task
         name: mas-devops-suite-app-upgrade
       runAfter:
-        - app-manage-upgrade
+        - app-iot-upgrade
 
-    # 11. Monitor Upgrade (Phase 6 - after IoT)
+    # 11. Predict Upgrade (Phase 7 - after Monitor)
     # -------------------------------------------------------------------------
-    - name: app-monitor-upgrade
+    - name: app-predict-upgrade
       timeout: "0"
       params:
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: monitor
+          value: predict
         - name: mas_app_channel
-          value: $(params.mas_app_channel_monitor)
+          value: $(params.mas_app_channel_predict)
         - name: skip_compatibility_check
           value: $(params.skip_compatibility_check)
         - name: devops_suite_name
-          value: app-monitor-upgrade
+          value: app-predict-upgrade
       taskRef:
         kind: Task
         name: mas-devops-suite-app-upgrade
       runAfter:
-        - app-iot-upgrade
+        - app-manage-upgrade
+        - app-monitor-upgrade
 
     # 12. Verify health of the cluster after upgrade
     # -------------------------------------------------------------------------