From 3e4887328b2200936e0e95218f52adace4f2d2b4 Mon Sep 17 00:00:00 2001 From: Josef Harte Date: Fri, 15 May 2026 13:34:52 +0100 Subject: [PATCH 1/6] tenant deprovisioning param --- .../templates/07-aiservice-workspace.yaml | 3 +++ instance-applications/115-ibm-aiservice-tenant/values.yaml | 1 + .../templates/100-ibm-aiservice-tenant-app.yaml | 1 + root-applications/ibm-aiservice-tenant-root/values.yaml | 1 + 4 files changed, 6 insertions(+) diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml index 221809aba..1189d4a1e 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml @@ -22,6 +22,9 @@ metadata: {{- end }} spec: settings: + {{- if not hasPrefix "9.1." (toString .Values.catalog_channel) }} + enableDeprovisioning: "{{ .Values.enable_deprovisioning }}" + {{- end }} icr: cp: "{{ .Values.mas_icr_cp }}" cpopen: "{{ .Values.mas_icr_cpopen }}" diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 5c36729ba..160a64b74 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -6,6 +6,7 @@ tenant_id: "aiservice-t01" aiservice_namespace: "aiservice-inst-1-aiservice" aiservice_instance_id: "aiservice-inst-1" tenantNamespace: "aiservice-usr1" +enable_deprovisioning: false mas_icr_cp: "cp.icr.io/cp" mas_icr_cpopen: "icr.io/cpopen" 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 a39597106..ed5ce4307 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 @@ -48,6 +48,7 @@ spec: tenant_id: "{{ .Values.ibm_aiservice_tenant.tenant_id }}" aiservice_instance_id: "{{ .Values.ibm_aiservice_tenant.aiservice_instance_id }}" aiservice_namespace: "{{ .Values.ibm_aiservice_tenant.aiservice_namespace }}" + enable_deprovisioning: {{ eq .Values.ibm_aiservice_tenant.enable_deprovisioning true }} account_id: "{{ .Values.account.id }}" region_id: "{{ .Values.region.id }}" diff --git a/root-applications/ibm-aiservice-tenant-root/values.yaml b/root-applications/ibm-aiservice-tenant-root/values.yaml index e524bf77e..5ac6dfb44 100644 --- a/root-applications/ibm-aiservice-tenant-root/values.yaml +++ b/root-applications/ibm-aiservice-tenant-root/values.yaml @@ -267,6 +267,7 @@ ibm_aiservice_tenant: mas_aiservice_tenant_name: "user" tenant_action: "true" tenantNamespace: 'aiservice-{{ mas_aiservice_tenant_name }}' + enable_deprovisioning: false # cluster_domain: "" mas_icr_cp: "cp.icr.io/cp" From 692eb4ee866e683ea2751627b2720e891a396dd8 Mon Sep 17 00:00:00 2001 From: Josef Harte Date: Wed, 27 May 2026 09:39:48 +0100 Subject: [PATCH 2/6] fix value ref --- .../templates/100-ibm-aiservice-tenant-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c5cc86fd2..25efb651f 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 @@ -49,7 +49,7 @@ spec: tenant_id: "{{ .Values.ibm_aiservice_tenant.tenant_id }}" aiservice_instance_id: "{{ .Values.ibm_aiservice_tenant.aiservice_instance_id }}" aiservice_namespace: "{{ .Values.ibm_aiservice_tenant.aiservice_namespace }}" - enable_deprovisioning: {{ eq .Values.ibm_aiservice_tenant.enable_deprovisioning true }} + enable_deprovisioning: {{ .Values.ibm_aiservice_tenant.enable_deprovisioning }} account_id: "{{ .Values.account.id }}" region_id: "{{ .Values.region.id }}" From 36bf7d6cae0c69c25cce01c189105cba10e1feac Mon Sep 17 00:00:00 2001 From: Josef Harte Date: Thu, 28 May 2026 13:28:58 +0100 Subject: [PATCH 3/6] remove boolean quotes --- .../templates/07-aiservice-workspace.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml index 355fc77fd..7ac0afbbb 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml @@ -23,7 +23,7 @@ metadata: spec: settings: {{- if not hasPrefix "9.1." (toString .Values.catalog_channel) }} - enableDeprovisioning: "{{ .Values.enable_deprovisioning }}" + enableDeprovisioning: {{ .Values.enable_deprovisioning }} {{- end }} icr: cp: "{{ .Values.mas_icr_cp }}" From c36aa8917b1f105a8a7b5a7ab1f1a7db9373f320 Mon Sep 17 00:00:00 2001 From: Josef Harte Date: Thu, 28 May 2026 13:35:24 +0100 Subject: [PATCH 4/6] try filters --- .../templates/07-aiservice-workspace.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml index 7ac0afbbb..ff535d78f 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml @@ -23,7 +23,7 @@ metadata: spec: settings: {{- if not hasPrefix "9.1." (toString .Values.catalog_channel) }} - enableDeprovisioning: {{ .Values.enable_deprovisioning }} + enableDeprovisioning: {{ .Values.enable_deprovisioning | toString | lower | eq "true" }} {{- end }} icr: cp: "{{ .Values.mas_icr_cp }}" From cec5a707bd1b755d383ecc2f9538ffb332c6ea17 Mon Sep 17 00:00:00 2001 From: Josef Harte Date: Thu, 28 May 2026 13:42:53 +0100 Subject: [PATCH 5/6] test conditional del --- .../templates/07-aiservice-workspace.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml index ff535d78f..fa3ad08c1 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml @@ -1,4 +1,4 @@ -{{- if .Values.application_admin_role }} + --- apiVersion: aiservice.ibm.com/v1 kind: AIServiceTenant @@ -58,4 +58,4 @@ spec: {{ .Values.tenant_scheduling_config | toYaml | indent 6 }} {{- end }} {{- end }} -{{- end }} + From b74ebd03cf356b36bcc2596dff7607dc4ad6e88a Mon Sep 17 00:00:00 2001 From: Josef Harte Date: Thu, 28 May 2026 13:50:39 +0100 Subject: [PATCH 6/6] fix filter --- .../templates/07-aiservice-workspace.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml index fa3ad08c1..dd76ffa66 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml @@ -1,4 +1,4 @@ - +{{- if .Values.application_admin_role }} --- apiVersion: aiservice.ibm.com/v1 kind: AIServiceTenant @@ -22,7 +22,7 @@ metadata: {{- end }} spec: settings: - {{- if not hasPrefix "9.1." (toString .Values.catalog_channel) }} + {{- if not (hasPrefix "9.1." (toString .Values.catalog_channel)) }} enableDeprovisioning: {{ .Values.enable_deprovisioning | toString | lower | eq "true" }} {{- end }} icr: @@ -58,4 +58,4 @@ spec: {{ .Values.tenant_scheduling_config | toYaml | indent 6 }} {{- end }} {{- end }} - +{{- end }}