From eb7936d9d7b10df7b9dba6cc8f5158d7b522bb86 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 24 Nov 2025 12:57:29 +0530 Subject: [PATCH 01/17] MASCORE-10416 : health check added --- .../templates/gitops/bootstrap/argocd.yaml.j2 | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/image/cli/mascli/templates/gitops/bootstrap/argocd.yaml.j2 b/image/cli/mascli/templates/gitops/bootstrap/argocd.yaml.j2 index 13087e5e971..b3ffc8562d7 100644 --- a/image/cli/mascli/templates/gitops/bootstrap/argocd.yaml.j2 +++ b/image/cli/mascli/templates/gitops/bootstrap/argocd.yaml.j2 @@ -155,6 +155,29 @@ spec: hs.message = "" return hs + config.mas.ibm.com/AppCfg: + health.lua: | + hs = {} + if obj.status ~= nil then + if obj.status.conditions ~= nil then + for i, condition in ipairs(obj.status.conditions) do + if condition.type == "Failure" and condition.status == "True" then + hs.status = "Degraded" + hs.message = condition.message + return hs + end + if condition.type == "Successful" and condition.status == "True" then + hs.status = "Healthy" + hs.message = condition.message + return hs + end + end + end + end + hs.status = "Progressing" + hs.message = "" + return hs + apps.mas.ibm.com/AIServiceTenant: health.lua: | hs = {} From 9bad4cc8aa7362178efc9723c84b636cfcbf3a34 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 27 Nov 2025 19:42:08 +0530 Subject: [PATCH 02/17] variables related to maf are added --- .secrets.baseline | 10 +- image/cli/mascli/functions/gitops_mas_config | 45 ++++++- image/cli/mascli/functions/gitops_suite | 5 + .../configs/ibm-mas-appcfg-config.yaml.j2 | 22 ++++ .../instance/ibm-mas-instance-base.yaml.j2 | 4 + tekton/generate-tekton-tasks.yml | 4 +- .../gitops/gitops-mas-instance.yml.j2 | 89 +++++++++++++ .../src/tasks/gitops/gitops-app-config.yml.j2 | 119 ++++++++++++++++++ .../gitops/gitops-delete-app-config.yml.j2 | 100 +++++++++++++++ tekton/src/tasks/gitops/gitops-suite.yml.j2 | 5 + 10 files changed, 391 insertions(+), 12 deletions(-) create mode 100644 image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 create mode 100644 tekton/src/tasks/gitops/gitops-app-config.yml.j2 create mode 100644 tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 diff --git a/.secrets.baseline b/.secrets.baseline index 0c0567524d7..e9601bc80a4 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$", "lines": null }, - "generated_at": "2025-11-06T16:17:33Z", + "generated_at": "2025-11-27T14:11:44Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -390,7 +390,7 @@ "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", "is_secret": false, "is_verified": false, - "line_number": 643, + "line_number": 667, "type": "Secret Keyword", "verified_result": null }, @@ -398,7 +398,7 @@ "hashed_secret": "effb7852555adce89885fb075fb43a77a1e0e77e", "is_secret": false, "is_verified": false, - "line_number": 823, + "line_number": 858, "type": "Secret Keyword", "verified_result": null }, @@ -406,7 +406,7 @@ "hashed_secret": "2582aea6f911bd00fc04cb25e0ec16d5ead62068", "is_secret": false, "is_verified": false, - "line_number": 825, + "line_number": 860, "type": "Secret Keyword", "verified_result": null } @@ -444,7 +444,7 @@ "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", "is_secret": false, "is_verified": false, - "line_number": 545, + "line_number": 550, "type": "Secret Keyword", "verified_result": null } diff --git a/image/cli/mascli/functions/gitops_mas_config b/image/cli/mascli/functions/gitops_mas_config index d6f4df820c1..baed0e7045c 100644 --- a/image/cli/mascli/functions/gitops_mas_config +++ b/image/cli/mascli/functions/gitops_mas_config @@ -16,7 +16,7 @@ GitOps Configuration: -a, --account-id ${COLOR_YELLOW}ACCOUNT_ID${TEXT_RESET} Account name that the cluster belongs to -c, --cluster-id ${COLOR_YELLOW}CLUSTER_ID${TEXT_RESET} Cluster ID --config-action ${COLOR_YELLOW}CONFIG_ACTION${TEXT_RESET} One of upsert|remove. - --mas-config-type ${COLOR_YELLOW}MAS_CONFIG_TYPE${TEXT_RESET} One of bas|jdbc|kafka|ldap-default|mongo|objectstorage|sls|smtp + --mas-config-type ${COLOR_YELLOW}MAS_CONFIG_TYPE${TEXT_RESET} One of appcfg|bas|jdbc|kafka|ldap-default|mongo|objectstorage|sls|smtp --mas-config-scope ${COLOR_YELLOW}MAS_CONFIG-SCOPE${TEXT_RESET} One of system|ws|app|wsapp --disable-postdelete-hooks ${COLOR_YELLOW}USE_POSTDELETE_HOOKS${TEXT_RESET} Unless set (or USE_POSTDELETE_HOOKS exported and set to false), PostDelete hooks will be deployed to ensure config CRs are properly cleaned up by ArgoCD on deletion. !!! PostDelete hooks should never be used when ArgoCD version < 2.10 !!! @@ -47,6 +47,11 @@ DRO Configuration (required if MAS_CONFIG_TYPE is "bas"): --mas-segment-key ${COLOR_YELLOW}MAS_SEGMENT_KEY${TEXT_RESET} The segment key for authentication for Segment --mas-bascfg-pod-template-yaml ${COLOR_YELLOW}MAS_BASCFG_POD_TEMPLATE_YAML${TEXT_RESET} The location of a file containing the POD template +MAF Configuration (required if MAS_CONFIG_TYPE is "appcfg"): + --maf-enabled ${COLOR_YELLOW}MAF_ENABLED${TEXT_RESET} Enable MAF for the application configuration (true|false) + --maf-storageClassName ${COLOR_YELLOW}MAF_STORAGE_CLASSNAME${TEXT_RESET} Storage class name to use for MAF persistent storage + --mas-appcfg-pod-template-yaml ${COLOR_YELLOW}MAS_APPCFG_POD_TEMPLATE_YAML${TEXT_RESET} + IDP/LDAP Configuration (required if MAS_CONFIG_TYPE is "ldap-default"): --idpcfg-display-name ${COLOR_YELLOW}IDPCFG_DISPLAY_NAME${TEXT_RESET} Display name for IDPCfg resource --ldap-url ${COLOR_YELLOW}LDAP_URL${TEXT_RESET} Url of the LDAP server. In the form protocol://host:port @@ -183,7 +188,15 @@ function gitops_mas_config_noninteractive() { --mas-bascfg-pod-template-yaml) export MAS_BASCFG_POD_TEMPLATE_YAML=$1 && shift ;; - + --mas-appcfg-pod-template-yaml) + export MAS_APPCFG_POD_TEMPLATE_YAML=$1 && shift + ;; + --maf-enabled) + export MAF_ENABLED=$1 && shift + ;; + --maf-storageClassName) + export MAF_STORAGE_CLASSNAME=$1 && shift + ;; # LDAP --idpcfg-display-name) export IDPCFG_DISPLAY_NAME=$1 && shift @@ -337,8 +350,8 @@ function gitops_mas_config_noninteractive() { fi [[ -z "$MAS_CONFIG_TYPE" ]] && gitops_mas_config_help "MAS_INSTANCE_ID is not set" - if ! [[ "$MAS_CONFIG_TYPE" =~ ^(bas|jdbc|kafka|ldap-default|mongo|objectstorage|sls|smtp|watsonstudio)$ ]]; then - gitops_mas_config_help "Invalid MAS_CONFIG_TYPE \"${MAS_CONFIG_TYPE}\"; must be one of bas|jdbc|kafka|ldap-default|mongo|objectstorage|sls|smtp|watsonstudio" + if ! [[ "$MAS_CONFIG_TYPE" =~ ^(appcfg|bas|jdbc|kafka|ldap-default|mongo|objectstorage|sls|smtp|watsonstudio)$ ]]; then + gitops_mas_config_help "Invalid MAS_CONFIG_TYPE \"${MAS_CONFIG_TYPE}\"; must be one of appcfg|bas|jdbc|kafka|ldap-default|mongo|objectstorage|sls|smtp|watsonstudio" fi [[ -z "$MAS_CONFIG_SCOPE" ]] && gitops_mas_config_help "MAS_CONFIG_SCOPE is not set" @@ -374,6 +387,11 @@ function gitops_mas_config_noninteractive() { [[ -z "$DRO_CA_CERTIFICATE_FILE" ]] && gitops_mas_config_help "DRO_CA_CERTIFICATE_FILE is not set" fi + if [ "${MAS_CONFIG_TYPE}" == "appcfg" ]; then + [[ -z "$MAF_ENABLED" ]] && gitops_mas_config_help "MAF_ENABLED is not set" + # [[ -z "$MAS_APPCFG_POD_TEMPLATE_YAML" ]] && gitops_mas_config_help "MAS_APPCFG_POD_TEMPLATE_YAML is not set" + [[ -z "$MAF_STORAGE_CLASSNAME" ]] && gitops_mas_config_help "MAF_STORAGE_CLASSNAME is not set" + fi # if [ "${MAS_CONFIG_TYPE}" == "sls" ]; then # No specific parameters required for sls at present; they are all fetched from SM # fi @@ -577,7 +595,13 @@ function gitops_mas_config() { echo_reset_dim "Pod Template YAML File ........ ${COLOR_MAGENTA}${MAS_BASCFG_POD_TEMPLATE_YAML}" reset_colors fi - + if [ "${MAS_CONFIG_TYPE}" == "appcfg" ]; then + echo "${TEXT_DIM}" + echo_reset_dim "MAF Enabled ................... ${COLOR_MAGENTA}${MAF_ENABLED}" + echo_reset_dim "MAF Storage Class Name ........ ${COLOR_MAGENTA}${MAF_STORAGE_CLASSNAME}" + echo_reset_dim "Pod Template YAML File ........ ${COLOR_MAGENTA}${MAS_APPCFG_POD_TEMPLATE_YAML}" + reset_colors + fi if [ "${MAS_CONFIG_TYPE}" == "sls" ]; then echo "${TEXT_DIM}" echo_reset_dim "SLS URL ....................... ${COLOR_MAGENTA}https://sls.mas-${MAS_INSTANCE_ID}-sls.svc" @@ -731,6 +755,17 @@ function gitops_mas_config() { fi fi + if [ "${MAS_CONFIG_TYPE}" == "appcfg" ]; then + + # Set pod template yaml + # --------------------------------------------------------------------------- + if [[ -n "$MAS_APPCFG_POD_TEMPLATE_YAML" && -s "$MAS_APPCFG_POD_TEMPLATE_YAML" ]]; then + export MAS_APPCFG_POD_TEMPLATE=$(yq eval '.podTemplates' ${MAS_APPCFG_POD_TEMPLATE_YAML}) + echo -e "\n - MAS_APPCFG_POD_TEMPLATE CONTENT .................. ${MAS_APPCFG_POD_TEMPLATE}" + fi + + fi + if [ "${MAS_CONFIG_TYPE}" == "sls" ]; then export SECRET_NAME_SLS=${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}${MAS_INSTANCE_ID}${SECRETS_KEY_SEPERATOR}sls export SECRET_KEY_SLS_REGISTRATION_KEY=${SECRET_NAME_SLS}#registration_key diff --git a/image/cli/mascli/functions/gitops_suite b/image/cli/mascli/functions/gitops_suite index 273d6d312aa..792f598b2a3 100644 --- a/image/cli/mascli/functions/gitops_suite +++ b/image/cli/mascli/functions/gitops_suite @@ -41,6 +41,7 @@ IBM Maximo Application Suite: --mas-pod-template-yaml ${COLOR_YELLOW}MAS_POD_TEMPLATE_YAML${TEXT_RESET} The location of a file containing the POD template --allow-list ${COLOR_YELLOW}ALLOW_LIST${TEXT_RESET} List of IPs or CIDR range to whitelist --additional-vpn ${COLOR_YELLOW}ADDITIONAL_VPN{TEXT_RESET} Manage additional client VPN + --application-configuration ${COLOR_YELLOW}APPLICATION_CONFIGURATION${TEXT_RESET} Application Configuration enable/disable (true/false) --extensions ${COLOR_YELLOW}EXTENSIONS${TEXT_RESET} To enable JAVA or 3rd party code extensions --enhanced-dr ${COLOR_YELLOW}ENHANCED_DR${TEXT_RESET} To enable Enhanced Disaster Recovery --is-non-shared-cluster ${COLOR_YELLOW}IS_NON_SHARED_CLUSTER${TEXT_RESET} To enable Non shared cluster @@ -240,6 +241,9 @@ function gitops_suite_noninteractive() { --additional-vpn) export ADDITIONAL_VPN=$1 && shift ;; + --application-configuration) + export APPLICATION_CONFIGURATION=$1 && shift + ;; --extensions) export EXTENSIONS=$1 && shift ;; @@ -525,6 +529,7 @@ function gitops_suite() { echo_reset_dim "OIDC Config ................................ ${COLOR_MAGENTA}${OIDC_CONFIG}" echo_reset_dim "Allow List ................................. ${COLOR_MAGENTA}${ALLOW_LIST}" echo_reset_dim "Additional VPN ............................. ${COLOR_MAGENTA}${ADDITIONAL_VPN}" + echo_reset_dim "Application Configuration .................. ${COLOR_MAGENTA}${APPLICATION_CONFIGURATION}" echo_reset_dim "Enhanced Disaster Recovery ................. ${COLOR_MAGENTA}${ENHANCED_DR}" echo_reset_dim "Non shared cluster ......................... ${COLOR_MAGENTA}${IS_NON_SHARED_CLUSTER}" echo_reset_dim "Java or 3rd Party Code Extensions .......... ${COLOR_MAGENTA}${EXTENSIONS}" diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 new file mode 100644 index 00000000000..0efe1fedbb4 --- /dev/null +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 @@ -0,0 +1,22 @@ +mas_config_name: "{{ MAS_CONFIG_NAME }}" +mas_config_chart: ibm-mas-app-config +mas_config_scope: {{ MAS_CONFIG_SCOPE }} +mas_workspace_id: {{ MAS_WORKSPACE_ID }} +mas_application_id: {{ MAS_APP_ID }} +mas_config_kind: "AppCfg" +mas_config_api_version: "config.mas.ibm.com" +use_postdelete_hooks: {{ USE_POSTDELETE_HOOKS }} + +system_appcfg_labels: + mas.ibm.com/configScope: system + mas.ibm.com/instanceId: "{{ MAS_INSTANCE_ID }}" + +persistentVolume: + name: app-config + size: 2Gi + storageClassName: {{ DEFAULT_FILE_STORAGE_CLASS }} + +{% if MAS_APPCFG_POD_TEMPLATE is defined and MAS_APPCFG_POD_TEMPLATE !='' %} +mas_appcfg_pod_templates: + {{ MAS_APPCFG_POD_TEMPLATE | indent(2) }} +{% endif %} \ No newline at end of file diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-instance-base.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-instance-base.yaml.j2 index 823961cbae8..b6194e0f5a6 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-instance-base.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-instance-base.yaml.j2 @@ -35,6 +35,10 @@ allow_list: {{ ALLOW_LIST }} additional_vpn: {{ ADDITIONAL_VPN }} {% endif %} +{% if APPLICATION_CONFIGURATION is defined and APPLICATION_CONFIGURATION != '' %} +application_configuration: {{ APPLICATION_CONFIGURATION }} +{% endif %} + {% if EXTENSIONS is defined and EXTENSIONS != '' %} extensions: {{ EXTENSIONS }} {% endif %} diff --git a/tekton/generate-tekton-tasks.yml b/tekton/generate-tekton-tasks.yml index cfba314dbb9..ed44bff55f0 100644 --- a/tekton/generate-tekton-tasks.yml +++ b/tekton/generate-tekton-tasks.yml @@ -249,9 +249,9 @@ - gitops-suite - gitops-odh - gitops-deprovision-odh - - gitops-aiservice - gitops-aiservice-tenant - gitops-deprovision-aiservice-tenant - gitops-deprovision-aiservice - + - gitops-app-config + - gitops-delete-app-config diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index cef8e9daa65..4ba4391db9a 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -229,6 +229,20 @@ spec: type: string - name: additional_vpn type: string + - name: application_configuration + type: string + default: "true" + + # maf parameters + # ------------------------------------------------------------------------- + - name: mas_appcfg_pod_template_yaml + type: string + default: "" + - name: maf_enabled + type: string + - name: maf_storageClassName + type: string + default: "" tasks: @@ -442,6 +456,8 @@ spec: value: $(params.enhanced_dr) - name: additional_vpn value: $(params.additional_vpn) + - name: application_configuration + value: $(params.application_configuration) - name: extensions value: $(params.extensions) taskRef: @@ -727,6 +743,56 @@ spec: - name: shared-additional-configs workspace: shared-additional-configs + + # 6. MAS Suite App Config + # ------------------------------------------------------------------------- + - name: gitops-maf-config + runAfter: + - gitops-suite-config + params: + - name: cluster_name + value: $(params.cluster_name) + - name: account + value: $(params.account) + - name: secrets_path + value: $(params.secrets_path) + - name: mas_instance_id + value: $(params.mas_instance_id) + - 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: github_pat + value: $(params.github_pat) + - name: avp_aws_secret_region + value: $(params.avp_aws_secret_region) + - name: cluster_url + value: $(params.cluster_url) + - name: maf_enabled + value: $(params.maf_enabled) + - name: mas_appcfg_pod_template_yaml + value: $(params.mas_appcfg_pod_template_yaml) + - name: maf_storageClassName + value: $(params.maf_storageClassName) + taskRef: + kind: Task + name: gitops-app-config + when: + - input: "$(params.maf_enabled)" + operator: in + values: ["true"] + workspaces: + - name: configs + workspace: configs + - name: shared-additional-configs + workspace: shared-additional-configs + # ------------------------------------------------------------------------- # Deprovision task section # ------------------------------------------------------------------------- @@ -817,3 +883,26 @@ spec: - name: configs workspace: configs + + # 3. Deprovision app config + # ------------------------------------------------------------------------- + - name: gitops-delete-App-config + params: + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/gitops/common/gitops-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/gitops/common/secrets-params.yml.j2') | indent(8) }} + {{ lookup('template', pipeline_src_dir ~ '/taskdefs/gitops/common/git-params.yml.j2') | indent(8) }} + + - name: mas_instance_id + value: $(params.mas_instance_id) + - name: maf_enabled + value: $(params.maf_enabled) + taskRef: + kind: Task + name: gitops-delete-app-config + when: + - input: "$(params.maf_enabled)" + operator: in + values: ["false"] + workspaces: + - name: configs + workspace: configs diff --git a/tekton/src/tasks/gitops/gitops-app-config.yml.j2 b/tekton/src/tasks/gitops/gitops-app-config.yml.j2 new file mode 100644 index 00000000000..af6e8847019 --- /dev/null +++ b/tekton/src/tasks/gitops/gitops-app-config.yml.j2 @@ -0,0 +1,119 @@ +--- +apiVersion: tekton.dev/v1beta1 +kind: Task +metadata: + name: gitops-app-config +spec: + params: + - name: cluster_name + type: string + - name: cluster_url + type: string + default: "" + - name: account + type: string + - name: secrets_path + type: string + - name: git_branch + type: string + - name: github_org + type: string + - name: github_repo + type: string + - name: github_host + type: string + - name: avp_aws_secret_region + type: string + - name: mas_instance_id + type: string + - name: mas_app_id + type: string + - name: mas_config_scope + type: string + - name: mas_workspace_id + type: string + default: "" + - name: maf_enabled + type: string + - name: mas_appcfg_pod_template_yaml + type: string + - name: maf_storageClassName + type: string + + stepTemplate: + name: gitops-app-config + env: + - name: CLUSTER_ID + value: $(params.cluster_name) + - name: CLUSTER_URL + value: $(params.cluster_url) + - name: ACCOUNT_ID + value: $(params.account) + - name: GITHUB_REPO + value: $(params.github_repo) + - name: SECRETS_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: MAS_INSTANCE_ID + value: $(params.mas_instance_id) + - name: MAS_APP_ID + value: $(params.mas_app_id) + - name: MAS_CONFIG_SCOPE + value: $(params.mas_config_scope) + - name: MAS_WORKSPACE_ID + value: $(params.mas_workspace_id) + - name: MAF_ENABLED + value: "$(params.maf_enabled)" + - name: MAS_APPCFG_POD_TEMPLATE_YAML + value: "$(params.mas_appcfg_pod_template_yaml)" + - name: MAF_STORAGE_CLASSNAME + value: "$(params.maf_storageClassName)" + 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 + + mas gitops-mas-config \ + --account-id "$ACCOUNT_ID" \ + --cluster-id "$CLUSTER_ID" \ + --mas-instance-id "$MAS_INSTANCE_ID" \ + --mas-workspace-id "$MAS_WORKSPACE_ID" \ + --mas-app-id "$MAS_APP_ID" \ + --secrets-path "$SECRETS_PATH" \ + --github-push \ + --github-host "$GITHUB_HOST" \ + --github-org "$GITHUB_ORG" \ + --github-repo "$GITHUB_REPO" \ + --git-branch "$GIT_BRANCH" \ + --config-action upsert \ + --mas-config-scope "$MAS_CONFIG_SCOPE" \ + --mas-config-type appcfg \ + --dir /tmp/init-app-config-$MAS_APP_ID + + exit $? + command: + - /bin/sh + - -c + name: gitops-app-config + imagePullPolicy: Always + image: quay.io/ibmmas/cli:latest + workspaces: + - name: configs + - name: shared-gitops-configs diff --git a/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 b/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 new file mode 100644 index 00000000000..0e0bf5d080d --- /dev/null +++ b/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 @@ -0,0 +1,100 @@ +--- +apiVersion: tekton.dev/v1beta1 +kind: Task +metadata: + name: gitops-delete-app-config +spec: + params: + - name: cluster_name + type: string + - name: account + type: string + - name: secrets_path + type: string + - name: git_branch + type: string + - name: github_org + type: string + - name: github_repo + type: string + - name: github_host + type: string + - name: avp_aws_secret_region + type: string + - name: mas_instance_id + type: string + - name: mas_app_id + type: string + - name: mas_config_scope + type: string + - name: mas_workspace_id + type: string + default: "" + stepTemplate: + name: gitops-delete-app-config + env: + - name: CLUSTER_ID + value: $(params.cluster_name) + - name: ACCOUNT_ID + value: $(params.account) + - name: GITHUB_REPO + value: $(params.github_repo) + - name: SECRETS_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: MAS_INSTANCE_ID + value: $(params.mas_instance_id) + - name: MAS_APP_ID + value: $(params.mas_app_id) + - name: MAS_CONFIG_SCOPE + value: $(params.mas_config_scope) + - name: MAS_WORKSPACE_ID + value: $(params.mas_workspace_id) + 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 + + mas gitops-mas-config \ + --account-id "$ACCOUNT_ID" \ + --cluster-id "$CLUSTER_ID" \ + --mas-instance-id "$MAS_INSTANCE_ID" \ + --mas-workspace-id "$MAS_WORKSPACE_ID" \ + --mas-app-id "$MAS_APP_ID" \ + --secrets-path "$SECRETS_PATH" \ + --github-push \ + --github-host "$GITHUB_HOST" \ + --github-org "$GITHUB_ORG" \ + --github-repo "$GITHUB_REPO" \ + --git-branch "$GIT_BRANCH" \ + --config-action remove \ + --mas-config-scope "$MAS_CONFIG_SCOPE" \ + --mas-config-type appcfg \ + --dir /tmp/delete-app-config-$MAS_APP_ID + + exit $? + command: + - /bin/sh + - -c + name: gitops-delete-app-config + imagePullPolicy: IfNotPresent + image: quay.io/ibmmas/cli:latest + workspaces: + - name: configs diff --git a/tekton/src/tasks/gitops/gitops-suite.yml.j2 b/tekton/src/tasks/gitops/gitops-suite.yml.j2 index 30f24907c2b..04f6e5ba0e9 100644 --- a/tekton/src/tasks/gitops/gitops-suite.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-suite.yml.j2 @@ -142,6 +142,9 @@ spec: - name: extensions type: string default: "false" + - name: application_configuration + type: string + default: "true" stepTemplate: name: gitops-suite env: @@ -253,6 +256,8 @@ spec: value: $(params.is_non_shared_cluster) - name: EXTENSIONS value: $(params.extensions) + - name: APPLICATION_CONFIGURATION + value: $(params.application_configuration) envFrom: - configMapRef: From 5bfdf7cbeefb63bc977ce61b43fab3dd3632d8f7 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 28 Nov 2025 14:48:47 +0530 Subject: [PATCH 03/17] Update gitops-mas-instance.yml.j2 rename --- tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index e571956329a..a81fb4f2a74 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -894,7 +894,7 @@ spec: # 3. Deprovision app config # ------------------------------------------------------------------------- - - name: gitops-delete-App-config + - name: gitops-deprovision-app-config params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/gitops/common/gitops-params.yml.j2') | indent(8) }} {{ lookup('template', pipeline_src_dir ~ '/taskdefs/gitops/common/secrets-params.yml.j2') | indent(8) }} From c332e337121de98e271e097cf4d00b954628b315 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 28 Nov 2025 15:05:57 +0530 Subject: [PATCH 04/17] Update gitops-app-config.yml.j2 --- tekton/src/tasks/gitops/gitops-app-config.yml.j2 | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tekton/src/tasks/gitops/gitops-app-config.yml.j2 b/tekton/src/tasks/gitops/gitops-app-config.yml.j2 index af6e8847019..f3561b084ef 100644 --- a/tekton/src/tasks/gitops/gitops-app-config.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-app-config.yml.j2 @@ -26,10 +26,6 @@ spec: type: string - name: mas_instance_id type: string - - name: mas_app_id - type: string - - name: mas_config_scope - type: string - name: mas_workspace_id type: string default: "" @@ -65,10 +61,6 @@ spec: value: $(params.avp_aws_secret_region) - name: MAS_INSTANCE_ID value: $(params.mas_instance_id) - - name: MAS_APP_ID - value: $(params.mas_app_id) - - name: MAS_CONFIG_SCOPE - value: $(params.mas_config_scope) - name: MAS_WORKSPACE_ID value: $(params.mas_workspace_id) - name: MAF_ENABLED @@ -86,6 +78,8 @@ spec: steps: - args: - |- + mkdir -p /tmp/init-app-config + git config --global user.name "MAS Automation" git config --global user.email "you@example.com" git config --global user.password $GITHUB_PAT @@ -95,7 +89,6 @@ spec: --cluster-id "$CLUSTER_ID" \ --mas-instance-id "$MAS_INSTANCE_ID" \ --mas-workspace-id "$MAS_WORKSPACE_ID" \ - --mas-app-id "$MAS_APP_ID" \ --secrets-path "$SECRETS_PATH" \ --github-push \ --github-host "$GITHUB_HOST" \ @@ -103,9 +96,9 @@ spec: --github-repo "$GITHUB_REPO" \ --git-branch "$GIT_BRANCH" \ --config-action upsert \ - --mas-config-scope "$MAS_CONFIG_SCOPE" \ + --mas-config-scope system \ --mas-config-type appcfg \ - --dir /tmp/init-app-config-$MAS_APP_ID + --dir /tmp/init-app-config exit $? command: From 6f8220d3781699a6ec6853c4255e7221e47fa310 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 28 Nov 2025 15:25:48 +0530 Subject: [PATCH 05/17] Update gitops-delete-app-config.yml.j2 --- .../tasks/gitops/gitops-delete-app-config.yml.j2 | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 b/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 index 0e0bf5d080d..a3322017b18 100644 --- a/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 @@ -23,10 +23,6 @@ spec: type: string - name: mas_instance_id type: string - - name: mas_app_id - type: string - - name: mas_config_scope - type: string - name: mas_workspace_id type: string default: "" @@ -53,10 +49,6 @@ spec: value: $(params.avp_aws_secret_region) - name: MAS_INSTANCE_ID value: $(params.mas_instance_id) - - name: MAS_APP_ID - value: $(params.mas_app_id) - - name: MAS_CONFIG_SCOPE - value: $(params.mas_config_scope) - name: MAS_WORKSPACE_ID value: $(params.mas_workspace_id) envFrom: @@ -68,6 +60,7 @@ spec: steps: - args: - |- + mkdir -p /tmp/init-app-config git config --global user.name "MAS Automation" git config --global user.email "you@example.com" git config --global user.password $GITHUB_PAT @@ -85,10 +78,10 @@ spec: --github-repo "$GITHUB_REPO" \ --git-branch "$GIT_BRANCH" \ --config-action remove \ - --mas-config-scope "$MAS_CONFIG_SCOPE" \ + --mas-config-scope system \ --mas-config-type appcfg \ - --dir /tmp/delete-app-config-$MAS_APP_ID - + --dir /tmp/init-app-config + exit $? command: - /bin/sh From 2a54a15dba3f6bc564291e4f3dc09303fa234004 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 28 Nov 2025 15:31:31 +0530 Subject: [PATCH 06/17] Update gitops-delete-app-config.yml.j2 --- tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 b/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 index a3322017b18..33d9543dced 100644 --- a/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-delete-app-config.yml.j2 @@ -70,7 +70,6 @@ spec: --cluster-id "$CLUSTER_ID" \ --mas-instance-id "$MAS_INSTANCE_ID" \ --mas-workspace-id "$MAS_WORKSPACE_ID" \ - --mas-app-id "$MAS_APP_ID" \ --secrets-path "$SECRETS_PATH" \ --github-push \ --github-host "$GITHUB_HOST" \ @@ -81,7 +80,7 @@ spec: --mas-config-scope system \ --mas-config-type appcfg \ --dir /tmp/init-app-config - + exit $? command: - /bin/sh From 832dae51d90d82b48018a77ccdc8a53cf005de77 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Sun, 30 Nov 2025 18:39:05 +0530 Subject: [PATCH 07/17] Update gitops-mas-instance.yml.j2 shared-gitops-configs --- tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index a81fb4f2a74..0f3eee8a26a 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -800,7 +800,9 @@ spec: workspace: configs - name: shared-additional-configs workspace: shared-additional-configs - + - name: shared-gitops-configs + workspace: shared-gitops-configs + # ------------------------------------------------------------------------- # Deprovision task section # ------------------------------------------------------------------------- From 8a00f032974e5cbef3c95c07456890f005bf6bbc Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Sun, 30 Nov 2025 19:01:10 +0530 Subject: [PATCH 08/17] Update gitops-mas-instance.yml.j2 --- tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index 0f3eee8a26a..29304a8993b 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -798,11 +798,9 @@ spec: workspaces: - name: configs workspace: configs - - name: shared-additional-configs - workspace: shared-additional-configs - name: shared-gitops-configs workspace: shared-gitops-configs - + # ------------------------------------------------------------------------- # Deprovision task section # ------------------------------------------------------------------------- From 96aa469e2b00c101b7a7e8d44953b15872b8eec7 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Sun, 30 Nov 2025 19:51:34 +0530 Subject: [PATCH 09/17] Update ibm-mas-appcfg-config.yaml.j2 --- .../cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 index 0efe1fedbb4..c708508fb3a 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 @@ -11,10 +11,12 @@ system_appcfg_labels: mas.ibm.com/configScope: system mas.ibm.com/instanceId: "{{ MAS_INSTANCE_ID }}" +maf_enabled: {{ MAF_ENABLED }} + persistentVolume: name: app-config size: 2Gi - storageClassName: {{ DEFAULT_FILE_STORAGE_CLASS }} + storageClassName: {{ MAF_STORAGE_CLASSNAME }} {% if MAS_APPCFG_POD_TEMPLATE is defined and MAS_APPCFG_POD_TEMPLATE !='' %} mas_appcfg_pod_templates: From 523cb9d4bfbc20ab5c5887ebacb23ee83b38b3ca Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 26 Dec 2025 13:04:35 +0530 Subject: [PATCH 10/17] Update .secrets.baseline --- .secrets.baseline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.secrets.baseline b/.secrets.baseline index 9846def9f5d..507453f45c0 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$", "lines": null }, - "generated_at": "2025-12-26T07:30:40Z", + "generated_at": "2025-12-26T07:34:30Z", "plugins_used": [ { "name": "AWSKeyDetector" From b3627079378b7481981e64542bca429380ea94bb Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 6 Jan 2026 11:20:41 +0530 Subject: [PATCH 11/17] MAF_SIZE added --- .secrets.baseline | 8 ++++---- image/cli/mascli/functions/gitops_mas_config | 13 +++++++++---- .../instance/configs/ibm-mas-appcfg-config.yaml.j2 | 2 +- .../src/pipelines/gitops/gitops-mas-instance.yml.j2 | 5 +++++ tekton/src/tasks/gitops/gitops-app-config.yml.j2 | 5 ++++- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 69ead833773..4ddc4000ebb 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$", "lines": null }, - "generated_at": "2025-12-26T07:34:30Z", + "generated_at": "2026-01-06T05:49:22Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -400,7 +400,7 @@ "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", "is_secret": false, "is_verified": false, - "line_number": 684, + "line_number": 689, "type": "Secret Keyword", "verified_result": null }, @@ -408,7 +408,7 @@ "hashed_secret": "effb7852555adce89885fb075fb43a77a1e0e77e", "is_secret": false, "is_verified": false, - "line_number": 880, + "line_number": 885, "type": "Secret Keyword", "verified_result": null }, @@ -416,7 +416,7 @@ "hashed_secret": "2582aea6f911bd00fc04cb25e0ec16d5ead62068", "is_secret": false, "is_verified": false, - "line_number": 882, + "line_number": 887, "type": "Secret Keyword", "verified_result": null } diff --git a/image/cli/mascli/functions/gitops_mas_config b/image/cli/mascli/functions/gitops_mas_config index 801e1873e08..9c2b2f7a52f 100644 --- a/image/cli/mascli/functions/gitops_mas_config +++ b/image/cli/mascli/functions/gitops_mas_config @@ -49,8 +49,9 @@ DRO Configuration (required if MAS_CONFIG_TYPE is "bas"): --mas-bascfg-pod-template-yaml ${COLOR_YELLOW}MAS_BASCFG_POD_TEMPLATE_YAML${TEXT_RESET} The location of a file containing the POD template MAF Configuration (required if MAS_CONFIG_TYPE is "appcfg"): - --maf-enabled ${COLOR_YELLOW}MAF_ENABLED${TEXT_RESET} Enable MAF for the application configuration (true|false) - --maf-storageClassName ${COLOR_YELLOW}MAF_STORAGE_CLASSNAME${TEXT_RESET} Storage class name to use for MAF persistent storage + --maf-enabled ${COLOR_YELLOW}MAF_ENABLED${TEXT_RESET} Enable MAF for the application configuration (true|false) + --maf-storageClassName ${COLOR_YELLOW}MAF_STORAGE_CLASSNAME${TEXT_RESET} Storage class name to use for MAF persistent storage + --maf-size ${COLOR_YELLOW}MAF_SIZE${TEXT_RESET} Size of the MAF persistent storage (e.g. 2Gi) --mas-appcfg-pod-template-yaml ${COLOR_YELLOW}MAS_APPCFG_POD_TEMPLATE_YAML${TEXT_RESET} IDP/LDAP Configuration (required if MAS_CONFIG_TYPE is "ldap-default"): @@ -215,6 +216,9 @@ function gitops_mas_config_noninteractive() { --maf-storageClassName) export MAF_STORAGE_CLASSNAME=$1 && shift ;; + --maf-size) + export MAF_SIZE=$1 && shift + ;; # LDAP --idpcfg-display-name) export IDPCFG_DISPLAY_NAME=$1 && shift @@ -364,7 +368,7 @@ function gitops_mas_config_noninteractive() { gitops_mas_config_help "Invalid CONFIG_ACTION \"${CONFIG_ACTION}\"; must be one of 'upsert' or 'remove'" fi - [[ -z "$MAS_CONFIG_TYPE" ]] && gitops_mas_config_help "MAS_INSTANCE_ID is not set" + [[ -z "$MAS_CONFIG_TYPE" ]] && gitops_mas_config_help "MAS_CONFIG_TYPE is not set" if ! [[ "$MAS_CONFIG_TYPE" =~ ^(appcfg|bas|jdbc|kafka|ldap-default|mongo|objectstorage|sls|smtp|watsonstudio)$ ]]; then gitops_mas_config_help "Invalid MAS_CONFIG_TYPE \"${MAS_CONFIG_TYPE}\"; must be one of appcfg|bas|jdbc|kafka|ldap-default|mongo|objectstorage|sls|smtp|watsonstudio" fi @@ -404,7 +408,7 @@ function gitops_mas_config_noninteractive() { if [ "${MAS_CONFIG_TYPE}" == "appcfg" ]; then [[ -z "$MAF_ENABLED" ]] && gitops_mas_config_help "MAF_ENABLED is not set" - # [[ -z "$MAS_APPCFG_POD_TEMPLATE_YAML" ]] && gitops_mas_config_help "MAS_APPCFG_POD_TEMPLATE_YAML is not set" + [[ -z "$MAF_SIZE" ]] && gitops_mas_config_help "MAF_SIZE is not set" [[ -z "$MAF_STORAGE_CLASSNAME" ]] && gitops_mas_config_help "MAF_STORAGE_CLASSNAME is not set" fi # if [ "${MAS_CONFIG_TYPE}" == "sls" ]; then @@ -614,6 +618,7 @@ function gitops_mas_config() { echo "${TEXT_DIM}" echo_reset_dim "MAF Enabled ................... ${COLOR_MAGENTA}${MAF_ENABLED}" echo_reset_dim "MAF Storage Class Name ........ ${COLOR_MAGENTA}${MAF_STORAGE_CLASSNAME}" + echo_reset_dim "MAF Size ...................... ${COLOR_MAGENTA}${MAF_SIZE}" echo_reset_dim "Pod Template YAML File ........ ${COLOR_MAGENTA}${MAS_APPCFG_POD_TEMPLATE_YAML}" reset_colors fi diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 index c708508fb3a..5b112ba2f91 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-appcfg-config.yaml.j2 @@ -15,7 +15,7 @@ maf_enabled: {{ MAF_ENABLED }} persistentVolume: name: app-config - size: 2Gi + size: {{ MAF_SIZE }} storageClassName: {{ MAF_STORAGE_CLASSNAME }} {% if MAS_APPCFG_POD_TEMPLATE is defined and MAS_APPCFG_POD_TEMPLATE !='' %} diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index 29304a8993b..4304c2c2b73 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -243,6 +243,9 @@ spec: - name: maf_storageClassName type: string default: "" + - name: maf_size + type: string + default: "2Gi" # standalone sls - name: sls_service @@ -788,6 +791,8 @@ spec: value: $(params.mas_appcfg_pod_template_yaml) - name: maf_storageClassName value: $(params.maf_storageClassName) + - name: maf_size + value: $(params.maf_size) taskRef: kind: Task name: gitops-app-config diff --git a/tekton/src/tasks/gitops/gitops-app-config.yml.j2 b/tekton/src/tasks/gitops/gitops-app-config.yml.j2 index f3561b084ef..60668a06037 100644 --- a/tekton/src/tasks/gitops/gitops-app-config.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-app-config.yml.j2 @@ -35,7 +35,8 @@ spec: type: string - name: maf_storageClassName type: string - + - name: maf_size + type: string stepTemplate: name: gitops-app-config env: @@ -69,6 +70,8 @@ spec: value: "$(params.mas_appcfg_pod_template_yaml)" - name: MAF_STORAGE_CLASSNAME value: "$(params.maf_storageClassName)" + - name: MAF_SIZE + value: "$(params.maf_size)" envFrom: - configMapRef: name: environment-properties From 38282e18788c490ee18f96957ef46aed6f3f334b Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 13 Jan 2026 16:54:43 +0530 Subject: [PATCH 12/17] Update gitops-mas-instance.yml.j2 rename task --- tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index 4304c2c2b73..59b1fb2c78f 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -899,7 +899,7 @@ spec: # 3. Deprovision app config # ------------------------------------------------------------------------- - - name: gitops-deprovision-app-config + - name: gitops-deprovision-maf-app-config params: {{ lookup('template', pipeline_src_dir ~ '/taskdefs/gitops/common/gitops-params.yml.j2') | indent(8) }} {{ lookup('template', pipeline_src_dir ~ '/taskdefs/gitops/common/secrets-params.yml.j2') | indent(8) }} @@ -915,7 +915,7 @@ spec: when: - input: "$(params.maf_enabled)" operator: in - values: ["false"] + values: [""] workspaces: - name: configs workspace: configs From 7342d3706664d0b04cfd108815659453a9ed2ab1 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 13 Jan 2026 17:40:39 +0530 Subject: [PATCH 13/17] Update gitops-mas-instance.yml.j2 --- tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index 59b1fb2c78f..5b11bc80c87 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -798,8 +798,8 @@ spec: name: gitops-app-config when: - input: "$(params.maf_enabled)" - operator: in - values: ["true"] + operator: notin + values: [""] workspaces: - name: configs workspace: configs From 004a8a27eea62928ad53695a19ed09462cb52a78 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 13 Jan 2026 18:09:07 +0530 Subject: [PATCH 14/17] Update gitops-mas-instance.yml.j2 --- tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index 5b11bc80c87..9da35ff081a 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -798,8 +798,8 @@ spec: name: gitops-app-config when: - input: "$(params.maf_enabled)" - operator: notin - values: [""] + operator: in + values: ["true"] workspaces: - name: configs workspace: configs @@ -914,8 +914,8 @@ spec: name: gitops-delete-app-config when: - input: "$(params.maf_enabled)" - operator: in - values: [""] + operator: notin + values: ["true"] workspaces: - name: configs workspace: configs From b7183ad3b4682c02caaa7a4c1ef68e1641b6279e Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 13 Jan 2026 19:47:04 +0530 Subject: [PATCH 15/17] Update gitops-mas-instance.yml.j2 --- tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index 9da35ff081a..5b11bc80c87 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -798,8 +798,8 @@ spec: name: gitops-app-config when: - input: "$(params.maf_enabled)" - operator: in - values: ["true"] + operator: notin + values: [""] workspaces: - name: configs workspace: configs @@ -914,8 +914,8 @@ spec: name: gitops-delete-app-config when: - input: "$(params.maf_enabled)" - operator: notin - values: ["true"] + operator: in + values: [""] workspaces: - name: configs workspace: configs From 991a9e023db19be2c30cf1f6b1bd819b6d10cb0f Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 14 Jan 2026 09:38:02 +0530 Subject: [PATCH 16/17] Update gitops-mas-instance.yml.j2 --- tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index 5b11bc80c87..59b1fb2c78f 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -798,8 +798,8 @@ spec: name: gitops-app-config when: - input: "$(params.maf_enabled)" - operator: notin - values: [""] + operator: in + values: ["true"] workspaces: - name: configs workspace: configs From 8223fa42f5ed4556d489dd2f1757c1f356b4d86d Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 23 Jan 2026 18:43:41 +0530 Subject: [PATCH 17/17] Update gitops-mas-instance.yml.j2 --- tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index 59b1fb2c78f..d7d59469f7c 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -915,7 +915,7 @@ spec: when: - input: "$(params.maf_enabled)" operator: in - values: [""] + values: ["", "false"] workspaces: - name: configs workspace: configs