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 490424a20..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 @@ -22,6 +22,9 @@ metadata: {{- end }} spec: settings: + {{- if not (hasPrefix "9.1." (toString .Values.catalog_channel)) }} + enableDeprovisioning: {{ .Values.enable_deprovisioning | toString | lower | eq "true" }} + {{- 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 69ae7c41b..578b26a1a 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 801d01b73..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,6 +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: {{ .Values.ibm_aiservice_tenant.enable_deprovisioning }} 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 a92611074..9c43a5711 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"