diff --git a/.secrets.baseline b/.secrets.baseline index 30d479885d5..5d39e2719a9 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,8 +3,7 @@ "files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$|^docs/catalogs/", "lines": null }, - - "generated_at": "2026-05-01T10:41:14Z", + "generated_at": "2026-05-11T05:43:10Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -183,7 +182,7 @@ "hashed_secret": "6ffb91fd9c01e69b8e9093d84439c8b88dd8fe35", "is_secret": false, "is_verified": false, - "line_number": 75, + "line_number": 76, "type": "Secret Keyword", "verified_result": null }, @@ -191,7 +190,7 @@ "hashed_secret": "db40a6131d9b574bb057875df98fb03f9874d5b4", "is_secret": false, "is_verified": false, - "line_number": 91, + "line_number": 92, "type": "Secret Keyword", "verified_result": null }, @@ -199,7 +198,7 @@ "hashed_secret": "6fbaa59234a602571baf17a51592b436b33f8491", "is_secret": false, "is_verified": false, - "line_number": 92, + "line_number": 93, "type": "Secret Keyword", "verified_result": null }, @@ -207,7 +206,7 @@ "hashed_secret": "bd1b0b7f343605538b1da78056db3a7bddf3f807", "is_secret": false, "is_verified": false, - "line_number": 95, + "line_number": 96, "type": "Secret Keyword", "verified_result": null }, @@ -215,7 +214,7 @@ "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", "is_secret": false, "is_verified": false, - "line_number": 308, + "line_number": 312, "type": "Secret Keyword", "verified_result": null } @@ -225,7 +224,7 @@ "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", "is_secret": false, "is_verified": false, - "line_number": 368, + "line_number": 374, "type": "Secret Keyword", "verified_result": null } @@ -645,7 +644,7 @@ "hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd", "is_secret": false, "is_verified": false, - "line_number": 43, + "line_number": 44, "type": "Secret Keyword", "verified_result": null } diff --git a/image/cli/mascli/functions/gitops_aiservice b/image/cli/mascli/functions/gitops_aiservice index 1d3b4b87419..08d33bcc589 100644 --- a/image/cli/mascli/functions/gitops_aiservice +++ b/image/cli/mascli/functions/gitops_aiservice @@ -24,6 +24,7 @@ ibm aiservice(required): --aiservice-namespace ${TEXT_RESET}AISERVICE_NAMESPACE${TEXT_RESET} --aiservice-instance-id ${TEXT_RESET}AISERVICE_INSTANCE_ID${TEXT_RESET} --primary-storage-class ${TEXT_RESET}PRIMARY_STORAGE_CLASS${TEXT_RESET} + --aiservice-install-plan-approval ${TEXT_RESET}AISERVICE_INSTALL_PLAN_APPROVAL${TEXT_RESET} storage provider: --aiservice-storage-provider ${TEXT_RESET}AISERVICE_STORAGE_PROVIDER${TEXT_RESET} @@ -85,7 +86,7 @@ function gitops_aiservice_noninteractive() { export AISERVICE_STORAGE_REGION=${AISERVICE_STORAGE_REGION:-""} export AISERVICE_STORAGE_SSL=${AISERVICE_STORAGE_SSL:-"true"} export MAS_CATALOG_SOURCE=${MAS_CATALOG_SOURCE:-"ibm-operator-catalog"} - + export AISERVICE_INSTALL_PLAN_APPROVAL=${AISERVICE_INSTALL_PLAN_APPROVAL:-"Automatic"} export AISERVICE_S3_BUCKET_PREFIX=${AISERVICE_S3_BUCKET_PREFIX:-"m"} export ENVIRONMENT_TYPE=${ENVIRONMENT_TYPE:-"PRODUCTION"} export DRO_TOKEN_SECRET=${DRO_TOKEN_SECRET:-"dro-token"} @@ -170,6 +171,9 @@ function gitops_aiservice_noninteractive() { --mas-catalog-source) export MAS_CATALOG_SOURCE=$1 && shift ;; + --aiservice-install-plan-approval) + export AISERVICE_INSTALL_PLAN_APPROVAL=$1 && shift + ;; --environment-type) export ENVIRONMENT_TYPE=$1 && shift ;; @@ -340,6 +344,7 @@ function gitops_aiservice() { echo_reset_dim "Primary Storage Class ................. ${COLOR_MAGENTA}${PRIMARY_STORAGE_CLASS}" echo_reset_dim "Artifactory Username ................... ${COLOR_MAGENTA}${ARTIFACTORY_USERNAME}" echo_reset_dim "AiService Channel ...................... ${COLOR_MAGENTA}${AISERVICE_CHANNEL}" + echo_reset_dim "AIService Install Plan Approval ........ ${COLOR_MAGENTA}${AISERVICE_INSTALL_PLAN_APPROVAL}" echo_reset_dim "MAS Catalog Source ..................... ${COLOR_MAGENTA}${MAS_CATALOG_SOURCE}" echo_reset_dim "MAS ICR CP ............................. ${COLOR_MAGENTA}${MAS_ICR_CP}" echo_reset_dim "MAS ICR CPOpen ......................... ${COLOR_MAGENTA}${MAS_ICR_CPOPEN}" diff --git a/image/cli/mascli/functions/gitops_aiservice_tenant b/image/cli/mascli/functions/gitops_aiservice_tenant index aeb71b4a1a6..3d5652475a6 100644 --- a/image/cli/mascli/functions/gitops_aiservice_tenant +++ b/image/cli/mascli/functions/gitops_aiservice_tenant @@ -20,7 +20,8 @@ ibm_aiservice_tenant(required): --catalog-source ${TEXT_RESET}CATALOG_SOURCE${TEXT_RESET} The catalog source from which to install the tenant operator --catalog-channel ${TEXT_RESET}CATALOG_CHANNEL${TEXT_RESET} The catalog channel from which to install the tenant operator --tenantNamespace ${COLOR_YELLOW}TENANT_NAMESPACE${TEXT_RESET} The tenant's Kubernetes namespace - --tenant-id ${COLOR_YELLOW}TENANT_ID${TEXT_RESET} The tenant ID for the AI Service instance + --tenant-id ${COLOR_YELLOW}TENANT_ID${TEXT_RESET} + --aiservice-tenant-install-plan-approval ${TEXT_RESET}AISERVICE_TENANT_INSTALL_PLAN_APPROVAL${TEXT_RESET} The tenant ID for the AI Service instance --cluster-domain ${COLOR_YELLOW}CLUSTER_DOMAIN${TEXT_RESET} The domain name of the Kubernetes cluster (e.g., cluster.local) --dro-url ${COLOR_YELLOW}DRO_URL${TEXT_RESET} URL of the DRO configuration service --slscfg-url ${COLOR_YELLOW}SLSCFG_URL${TEXT_RESET} URL of the SLS configuration service @@ -32,7 +33,8 @@ AiService : --aiservice-provision-tenant ${COLOR_YELLOW}AISERVICE_PROVISION_TENANT${TEXT_RESET} Whether to provision the AI Service tenant --aiservice-instance-id ${COLOR_YELLOW}AISERVICE_INSTANCE_ID${TEXT_RESET} The AI Service instance ID --tenantNamespace ${COLOR_YELLOW}TENANT_NAMESPACE${TEXT_RESET} The tenant's Kubernetes namespace ---tenant-id ${COLOR_YELLOW}TENANT_ID${TEXT_RESET} The tenant ID for the AI Service instance +--tenant-id ${COLOR_YELLOW}TENANT_ID${TEXT_RESET} +--aiservice-tenant-install-plan-approval ${TEXT_RESET}AISERVICE_TENANT_INSTALL_PLAN_APPROVAL${TEXT_RESET} The tenant ID for the AI Service instance --cluster-domain ${COLOR_YELLOW}CLUSTER_DOMAIN${TEXT_RESET} The domain name of the Kubernetes cluster (e.g., cluster.local) --in-saas-env ${COLOR_YELLOW}IN_SAAS_ENV${TEXT_RESET} Whether the environment is SaaS (true/false) --aiservice_operator_log_level ${COLOR_YELLOW}AISERVICE_OPERATOR_LOG_LEVEL${TEXT_RESET} Log level for the AI Service operator (e.g., info, debug) @@ -102,6 +104,7 @@ function gitops_aiservice_tenant_noninteractive() { #adding default values # -- aiservice Defaults export AISERVICE_NAMESPACE=${AISERVICE_NAMESPACE:-"aiservice-${AISERVICE_INSTANCE_ID}"} export AISERVICE_PROVISION_TENANT=${AISERVICE_PROVISION_TENANT:-"provision-tenant"} + export AISERVICE_TENANT_INSTALL_PLAN_APPROVAL=${AISERVICE_TENANT_INSTALL_PLAN_APPROVAL:-"Automatic"} export CATALOG_SOURCE=${CATALOG_SOURCE:-"ibm-operator-catalog"} export IN_SAAS_ENV=${IN_SAAS_ENV:-"true"} export MAS_ICR_CP=${MAS_ICR_CP:-"docker-na-public.artifactory.swg-devops.com/wiotp-docker-local"} @@ -171,6 +174,9 @@ function gitops_aiservice_tenant_noninteractive() { --tenant-id) export TENANT_ID=$1 && shift ;; + --aiservice-tenant-install-plan-approval) + export AISERVICE_TENANT_INSTALL_PLAN_APPROVAL=$1 && shift + ;; --cluster-domain) export CLUSTER_DOMAIN=$1 && shift ;; @@ -395,6 +401,7 @@ function gitops_aiservice_tenant() { echo_reset_dim "AiService instance ID ......................... ${COLOR_MAGENTA}${AISERVICE_INSTANCE_ID}" echo_reset_dim "tenant namespace ............................. ${COLOR_MAGENTA}${TENANT_NAMESPACE}" echo_reset_dim "tenant ID .................................... ${COLOR_MAGENTA}${TENANT_ID}" + echo_reset_dim "AIService Tenant Install Plan Approval . ${COLOR_MAGENTA}${AISERVICE_TENANT_INSTALL_PLAN_APPROVAL}" echo_reset_dim "cluster domain ............................... ${COLOR_MAGENTA}${CLUSTER_DOMAIN}" echo_reset_dim "in SaaS environment .......................... ${COLOR_MAGENTA}${IN_SAAS_ENV}" diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice-tenant.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice-tenant.yaml.j2 index 4ef21b14e92..12bbf0b3b8e 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice-tenant.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice-tenant.yaml.j2 @@ -7,6 +7,7 @@ ibm_aiservice_tenant: aiservice_instance_id: "{{ AISERVICE_INSTANCE_ID }}" catalog_channel: "{{ CATALOG_CHANNEL }}" catalog_source: "{{ CATALOG_SOURCE }}" + aiservice_tenant_install_plan_approval: "{{ AISERVICE_TENANT_INSTALL_PLAN_APPROVAL }}" tenantNamespace: "{{ TENANT_NAMESPACE }}" mas_icr_cp: "{{ MAS_ICR_CP }}" diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice.yaml.j2 index abd4f3d8609..65af05d89c0 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice.yaml.j2 @@ -45,6 +45,7 @@ ibm_aiservice: artifactory_token: "" # Environment Variable: aiservice_channel: "{{ AISERVICE_CHANNEL }}" + aiservice_install_plan_approval: "{{ AISERVICE_INSTALL_PLAN_APPROVAL }}" mas_catalog_source: "{{ MAS_CATALOG_SOURCE }}" # Source container registry @@ -52,7 +53,6 @@ ibm_aiservice: mas_icr_cp: "{{ MAS_ICR_CP }}" mas_icr_cpopen: "{{ MAS_ICR_CPOPEN }}" - aiservice_domain: "{{ CLUSTER_DOMAIN }}" in_saas_env: {{ IN_SAAS_ENV }} aiservice_storage_class: "{{ PRIMARY_STORAGE_CLASS }}" diff --git a/tekton/src/pipelines/gitops/gitops-aiservice-pipeline.yml.j2 b/tekton/src/pipelines/gitops/gitops-aiservice-pipeline.yml.j2 index 549604b8949..49254042750 100644 --- a/tekton/src/pipelines/gitops/gitops-aiservice-pipeline.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-aiservice-pipeline.yml.j2 @@ -44,6 +44,9 @@ spec: type: string - name: aiservice_channel type: string + - name: aiservice_install_plan_approval + type: string + default: "Automatic" - name: mas_catalog_source type: string - name: mas_icr_cp @@ -205,6 +208,9 @@ spec: value: $(params.artifactory_username) - name: aiservice_channel value: $(params.aiservice_channel) + - name: aiservice_install_plan_approval + value: $(params.aiservice_install_plan_approval) + - name: mas_catalog_source value: $(params.mas_catalog_source) - name: mas_icr_cp diff --git a/tekton/src/pipelines/gitops/gitops-aiservice-tenant-pipeline.yml.j2 b/tekton/src/pipelines/gitops/gitops-aiservice-tenant-pipeline.yml.j2 index 4a95856d38f..7e1b8268e48 100644 --- a/tekton/src/pipelines/gitops/gitops-aiservice-tenant-pipeline.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-aiservice-tenant-pipeline.yml.j2 @@ -36,6 +36,9 @@ spec: type: string - name: catalog_source type: string + - name: aiservice_tenant_install_plan_approval + type: string + default: "Automatic" - name: tenantNamespace type: string - name: tenant_id @@ -138,6 +141,8 @@ spec: value: $(params.aiservice_tenant_catalog_channel) - name: catalog_source value: $(params.catalog_source) + - name: aiservice_tenant_install_plan_approval + value: $(params.aiservice_tenant_install_plan_approval) - name: tenantNamespace value: $(params.tenantNamespace) - name: tenant_id diff --git a/tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2 b/tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2 index 6e0f6b8576c..0127a49b18c 100644 --- a/tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2 @@ -35,6 +35,9 @@ spec: type: string - name: catalog_source type: string + - name: aiservice_tenant_install_plan_approval + type: string + default: "Automatic" - name: tenantNamespace type: string - name: tenant_id @@ -123,6 +126,8 @@ spec: value: $(params.aiservice_tenant_catalog_channel) - name: CATALOG_SOURCE value: $(params.catalog_source) + - name: AISERVICE_TENANT_INSTALL_PLAN_APPROVAL + value: $(params.aiservice_tenant_install_plan_approval) - name: TENANT_NAMESPACE value: $(params.tenantNamespace) - name: TENANT_ID diff --git a/tekton/src/tasks/gitops/gitops-aiservice.yml.j2 b/tekton/src/tasks/gitops/gitops-aiservice.yml.j2 index b0378668eb0..3b20b50dbde 100644 --- a/tekton/src/tasks/gitops/gitops-aiservice.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-aiservice.yml.j2 @@ -44,6 +44,9 @@ spec: type: string - name: aiservice_channel type: string + - name: aiservice_install_plan_approval + type: string + default: "Automatic" - name: mas_catalog_source type: string - name: mas_icr_cp @@ -118,6 +121,8 @@ spec: value: $(params.artifactory_username) - name: AISERVICE_CHANNEL value: $(params.aiservice_channel) + - name: AISERVICE_INSTALL_PLAN_APPROVAL + value: $(params.aiservice_install_plan_approval) - name: MAS_CATALOG_SOURCE value: $(params.mas_catalog_source) - name: MAS_ICR_CP