From 0dfa3c8218e6afd6eebf509cd6d3c198e20744e8 Mon Sep 17 00:00:00 2001 From: Sakshi Singhroha Date: Thu, 2 Apr 2026 17:32:06 +0530 Subject: [PATCH 1/9] Added configurable installPlanApproval to AI Service subscription template --- .../templates/04-aiservice-operator-subscription.yaml | 4 ++-- instance-applications/113-ibm-aiservice/values.yaml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml b/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml index 30e9ed043..93fbad20b 100644 --- a/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml +++ b/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml @@ -34,7 +34,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: "{{ .Values.aiservice_channel }}" - installPlanApproval: Automatic + installPlanApproval: {{ .Values.aiservice_install_plan_approval | default "Automatic" }} name: ibm-aiservice source: "{{ .Values.mas_catalog_source }}" - sourceNamespace: openshift-marketplace \ No newline at end of file + sourceNamespace: openshift-marketplace \ No newline at end of file diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index a4f155c12..680178976 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -35,6 +35,7 @@ mas_aiservice_db_secret_name: "MAS_AISERVICE_DB_SECRET_NAME" mas_aiservice_storage_pipelines_bucket: "MAS_AISERVICE_STORAGE_PIPELINES_BUCKET" mas_aiservice_storage_tenants_bucket: "MAS_AISERVICE_STORAGE_TENANTS_BUCKET" mas_aiservice_storage_templates_bucket: "MAS_AISERVICE_STORAGE_TEMPLATES_BUCKET" +installPlanApproval: {{ .Values.aiservice_install_plan_approval | default "Automatic" }} # DRO @@ -68,6 +69,8 @@ mas_app_channel: "mas_app_channel" # aiservice vars mas_catalog_source: "MAS_CATALOG_SOURCE" +aiservice_channel: "9.1.x" +aiservice_install_plan_approval: "Automatic" # Source container registry # ----------------------------------------------------------------------------- From d280899aaaf04fbf74aae32ddab2562202874b8c Mon Sep 17 00:00:00 2001 From: Sakshi Singhroha Date: Wed, 29 Apr 2026 11:22:13 +0530 Subject: [PATCH 2/9] Configured aiservice install plan approval --- instance-applications/113-ibm-aiservice/values.yaml | 3 ++- root-applications/ibm-aiservice-instance-root/values.yaml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 680178976..12623fcc0 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -35,7 +35,7 @@ mas_aiservice_db_secret_name: "MAS_AISERVICE_DB_SECRET_NAME" mas_aiservice_storage_pipelines_bucket: "MAS_AISERVICE_STORAGE_PIPELINES_BUCKET" mas_aiservice_storage_tenants_bucket: "MAS_AISERVICE_STORAGE_TENANTS_BUCKET" mas_aiservice_storage_templates_bucket: "MAS_AISERVICE_STORAGE_TEMPLATES_BUCKET" -installPlanApproval: {{ .Values.aiservice_install_plan_approval | default "Automatic" }} + # DRO @@ -72,6 +72,7 @@ mas_catalog_source: "MAS_CATALOG_SOURCE" aiservice_channel: "9.1.x" aiservice_install_plan_approval: "Automatic" + # Source container registry # ----------------------------------------------------------------------------- mas_icr_cp: "cp.icr.io/cp" diff --git a/root-applications/ibm-aiservice-instance-root/values.yaml b/root-applications/ibm-aiservice-instance-root/values.yaml index d693b55df..d14859099 100644 --- a/root-applications/ibm-aiservice-instance-root/values.yaml +++ b/root-applications/ibm-aiservice-instance-root/values.yaml @@ -256,6 +256,8 @@ ibm_aiservice_tenant: tenant_id: "aiservice-tenant01" aiservice_namespace: "aiservice-inst-1-aiservice" aiservice_instance_id: "aiservice-inst-1" + aiservice_channel: "9.1.x" + aiservice_install_plan_approval: "Automatic" tenantNamespace: "aiservice-t1" mas_icr_cp: "cp.icr.io/cp" From 06d60891e52f2adcfc8c78b32454cc238614508b Mon Sep 17 00:00:00 2001 From: Sakshi Singhroha Date: Thu, 30 Apr 2026 18:07:26 +0530 Subject: [PATCH 3/9] Passed aiservice_install_plan_approval from root app to aiservice app --- .../templates/04-aiservice-operator-subscription.yaml | 2 +- .../templates/040-ibm-aiservice-app.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml b/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml index 93fbad20b..28186977c 100644 --- a/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml +++ b/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml @@ -34,7 +34,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: "{{ .Values.aiservice_channel }}" - installPlanApproval: {{ .Values.aiservice_install_plan_approval | default "Automatic" }} + installPlanApproval: {{ .Values.aiservice_install_plan_approval }} name: ibm-aiservice source: "{{ .Values.mas_catalog_source }}" sourceNamespace: openshift-marketplace \ No newline at end of file diff --git a/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml b/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml index 65fe2ce21..c88dd0e21 100644 --- a/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml +++ b/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml @@ -89,6 +89,8 @@ spec: aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}" aiservice_s3_region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}" aiservice_operator_log_level: "{{ .Values.ibm_aiservice.aiservice_operator_log_level }}" + aiservice_channel: "{{ .Values.ibm_aiservice.aiservice_channel }}" + aiservice_install_plan_approval: "{{ .Values.ibm_aiservice.aiservice_install_plan_approval }}" junitreporter: reporter_name: "ibm-aiservice-{{ .Values.instance.id }}" From fb343328692c532def45f15ad67f2057125bc95c Mon Sep 17 00:00:00 2001 From: Sakshi Singhroha Date: Mon, 4 May 2026 12:40:40 +0530 Subject: [PATCH 4/9] Removed Default values from values.yaml file --- instance-applications/113-ibm-aiservice/values.yaml | 3 +-- root-applications/ibm-aiservice-instance-root/values.yaml | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 12623fcc0..d40b12e7b 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -69,8 +69,7 @@ mas_app_channel: "mas_app_channel" # aiservice vars mas_catalog_source: "MAS_CATALOG_SOURCE" -aiservice_channel: "9.1.x" -aiservice_install_plan_approval: "Automatic" + # Source container registry diff --git a/root-applications/ibm-aiservice-instance-root/values.yaml b/root-applications/ibm-aiservice-instance-root/values.yaml index d14859099..d693b55df 100644 --- a/root-applications/ibm-aiservice-instance-root/values.yaml +++ b/root-applications/ibm-aiservice-instance-root/values.yaml @@ -256,8 +256,6 @@ ibm_aiservice_tenant: tenant_id: "aiservice-tenant01" aiservice_namespace: "aiservice-inst-1-aiservice" aiservice_instance_id: "aiservice-inst-1" - aiservice_channel: "9.1.x" - aiservice_install_plan_approval: "Automatic" tenantNamespace: "aiservice-t1" mas_icr_cp: "cp.icr.io/cp" From 90ca16ff35779b5faec493f62bfe37fb40aa34cc Mon Sep 17 00:00:00 2001 From: Sakshi Singhroha Date: Thu, 7 May 2026 15:16:42 +0530 Subject: [PATCH 5/9] removed extra whitespaces --- .../templates/04-aiservice-operator-subscription.yaml | 3 --- instance-applications/113-ibm-aiservice/values.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml b/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml index aa18838bd..4022c3091 100644 --- a/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml +++ b/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml @@ -38,9 +38,6 @@ spec: installPlanApproval: {{ .Values.aiservice_install_plan_approval }} name: ibm-aiservice source: "{{ .Values.mas_catalog_source }}" - sourceNamespace: openshift-marketplace - - {{- end }} diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 54d27574b..f87bc996a 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -37,7 +37,6 @@ mas_aiservice_storage_tenants_bucket: "MAS_AISERVICE_STORAGE_TENANTS_BUCKET" mas_aiservice_storage_templates_bucket: "MAS_AISERVICE_STORAGE_TEMPLATES_BUCKET" - # DRO mas_aiservice_dro_token_secret: "dro-token" mas_aiservice_dro_cacert_secret: "dro-certificates" @@ -70,8 +69,6 @@ mas_app_channel: "mas_app_channel" # aiservice vars mas_catalog_source: "MAS_CATALOG_SOURCE" - - # Source container registry # ----------------------------------------------------------------------------- mas_icr_cp: "cp.icr.io/cp" From 7564ad4b5cc7c6177a1ace345ac98fb6bb35ce94 Mon Sep 17 00:00:00 2001 From: Sakshi Singhroha Date: Fri, 8 May 2026 11:47:11 +0530 Subject: [PATCH 6/9] Remove duplicate aiservice_channel parameter from 040-ibm-aiservice-app.yaml --- .../templates/040-ibm-aiservice-app.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml b/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml index 89fde03b0..9cdf05219 100644 --- a/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml +++ b/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml @@ -94,7 +94,6 @@ spec: aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}" aiservice_s3_region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}" aiservice_operator_log_level: "{{ .Values.ibm_aiservice.aiservice_operator_log_level }}" - aiservice_channel: "{{ .Values.ibm_aiservice.aiservice_channel }}" aiservice_install_plan_approval: "{{ .Values.ibm_aiservice.aiservice_install_plan_approval }}" junitreporter: From b292b336f89475aa3e4be29503d33693bf15cf02 Mon Sep 17 00:00:00 2001 From: Sakshi Singhroha Date: Mon, 11 May 2026 12:33:44 +0530 Subject: [PATCH 7/9] Added installPlanApproval parameter for AIService Tenant operator --- .../templates/06-aiservice-tenant-operator-subscription.yaml | 2 +- .../templates/100-ibm-aiservice-tenant-app.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-tenant-operator-subscription.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-tenant-operator-subscription.yaml index 317245ac1..21ecff3e7 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-tenant-operator-subscription.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-tenant-operator-subscription.yaml @@ -23,7 +23,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: "{{ .Values.catalog_channel }}" - installPlanApproval: Automatic + installPlanApproval: {{ .Values.aiservice_tenant_install_plan_approval }} name: ibm-aiservice-tenant source: "{{ .Values.catalog_source }}" sourceNamespace: openshift-marketplace diff --git a/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml b/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml index 689e0a9cc..3cfc45589 100644 --- a/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml +++ b/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml @@ -44,6 +44,7 @@ spec: value: | catalog_source: "{{ .Values.ibm_aiservice_tenant.catalog_source }}" catalog_channel: "{{ .Values.ibm_aiservice_tenant.catalog_channel }}" + aiservice_tenant_install_plan_approval: "{{ .Values.ibm_aiservice_tenant.aiservice_tenant_install_plan_approval }}" tenant_id: "{{ .Values.ibm_aiservice_tenant.tenant_id }}" aiservice_instance_id: "{{ .Values.ibm_aiservice_tenant.aiservice_instance_id }}" From fce45ae7d83f394bfb8f18ff94d6e1763fe20832 Mon Sep 17 00:00:00 2001 From: Nivedithaa Mahendran Date: Thu, 14 May 2026 15:18:33 +0530 Subject: [PATCH 8/9] update clusteradminrole and applicationadminrole defaults for tenant appset --- .../templates/070-aiservice-tenant-appset.yaml | 4 ++-- .../templates/100-ibm-aiservice-tenant-app.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml b/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml index 997b6f6bc..79183b39e 100644 --- a/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml +++ b/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml @@ -71,9 +71,9 @@ spec: values: "{{ `{{ toYaml . }}` }}" parameters: - name: "cluster_admin_role" - value: "{{ .Values.cluster_admin_role }}" + value: "{{ if hasKey .Values `cluster_admin_role` }}{{ .Values.cluster_admin_role }}{{ else }}true{{ end }}" - name: "application_admin_role" - value: "{{ .Values.application_admin_role }}" + value: "{{ if hasKey .Values `application_admin_role` }}{{ .Values.application_admin_role }}{{ else }}true{{ end }}" - name: "generator.repo_url" value: "{{ .Values.generator.repo_url }}" - name: "generator.revision" diff --git a/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml b/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml index ad3ada1ea..b16bc2d97 100644 --- a/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml +++ b/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml @@ -133,10 +133,10 @@ spec: selfHeal: true retry: limit: 20 +{{- if .Values.cluster_admin_role }} syncOptions: - {{- if .Values.cluster_admin_role }} - CreateNamespace=true - {{- end }} +{{- end }} {{- if or .Values.custom_labels .Values.argocluster_instance }} managedNamespaceMetadata: labels: From a065c11bf17451153f2e905942c08ef86612563e Mon Sep 17 00:00:00 2001 From: Nivedithaa Mahendran Date: Thu, 14 May 2026 15:24:32 +0530 Subject: [PATCH 9/9] update --- .../templates/100-ibm-aiservice-tenant-app.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml b/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml index b16bc2d97..c66e75f7b 100644 --- a/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml +++ b/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml @@ -53,8 +53,8 @@ spec: account_id: "{{ .Values.account.id }}" region_id: "{{ .Values.region.id }}" cluster_id: "{{ .Values.cluster.id }}" - cluster_admin_role: {{ .Values.cluster_admin_role }} - application_admin_role: {{ .Values.application_admin_role }} + cluster_admin_role: {{ if hasKey .Values "cluster_admin_role" }}{{ .Values.cluster_admin_role }}{{ else }}true{{ end }} + application_admin_role: {{ if hasKey .Values "application_admin_role" }}{{ .Values.application_admin_role }}{{ else }}true{{ end }} # SAAS aiservice_saas_apikey: "{{ .Values.ibm_aiservice_tenant.aiservice_saas_apikey }}" mas_aiservice_saas: "{{ .Values.ibm_aiservice_tenant.mas_aiservice_saas }}"