From c8dc7bfa4bb42ec5c5f5bfd3cce9a949e3b74581 Mon Sep 17 00:00:00 2001
From: Josef Harte <josefharte@Josefs-MacBook-Pro.local>
Date: Thu, 14 May 2026 13:35:00 +0100
Subject: [PATCH 1/2] param for AI Service deprovisioning

---
 .secrets.baseline                                            | 4 ++--
 .../cluster/instance/ibm-aiservice-tenant.yaml.j2            | 1 +
 .../pipelines/gitops/gitops-aiservice-tenant-pipeline.yml.j2 | 5 +++++
 tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2       | 5 +++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index d2a2970abb..2a3f37ae45 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$|^docs/catalogs/",
     "lines": null
   },
-  "generated_at": "2026-05-12T12:20:28Z",
+  "generated_at": "2026-05-14T12:34:45Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -654,7 +654,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/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 165d8c2654..827070095c 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
@@ -8,6 +8,7 @@ ibm_aiservice_tenant:
   catalog_channel: "{{ CATALOG_CHANNEL }}"
   catalog_source: "{{ CATALOG_SOURCE }}"
   tenantNamespace: "{{ TENANT_NAMESPACE }}"
+  enable_deprovisioning: "{{ AISERVICE_ENABLE_DEPROVISIONING }}"
 
   mas_icr_cp: "{{ MAS_ICR_CP }}"
   mas_icr_cpopen: "{{ MAS_ICR_CPOPEN }}"
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 05aacf86ca..30433d5986 100644
--- a/tekton/src/pipelines/gitops/gitops-aiservice-tenant-pipeline.yml.j2
+++ b/tekton/src/pipelines/gitops/gitops-aiservice-tenant-pipeline.yml.j2
@@ -24,6 +24,9 @@ spec:
       type: string
     - name: github_host
       type: string
+    - name: aiservice_enable_deprovisioning
+      type: string
+      default: "false"
     - name: aiservice_namespace
       type: string
     - name: aiservice_provision_tenant
@@ -132,6 +135,8 @@ spec:
           value: $(params.github_repo)
         - name: github_host
           value: $(params.github_host)
+        - name: aiservice_enable_deprovisioning
+          value: $(params.aiservice_enable_deprovisioning)
         - name: aiservice_namespace
           value: $(params.aiservice_namespace)
         - name: aiservice_provision_tenant
diff --git a/tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2 b/tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2
index 8afe759e3d..ddf02cca00 100644
--- a/tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2
+++ b/tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2
@@ -23,6 +23,9 @@ spec:
       type: string
     - name: github_host
       type: string
+    - name: aiservice_enable_deprovisioning
+      type: string
+      default: "false
     - name: aiservice_namespace
       type: string
     - name: aiservice_provision_tenant
@@ -113,6 +116,8 @@ spec:
         value: $(params.github_host)
       - name: GITHUB_REPO
         value: $(params.github_repo)
+      - name: AISERVICE_ENABLE_DEPROVISIONING
+        value: $(params.aiservice_enable_deprovisioning)
       - name: AISERVICE_NAMESPACE
         value: $(params.aiservice_namespace)
       - name: AISERVICE_PROVISION_TENANT

From 626e89202f5f7de6f489cfcbc4c5da70fbab0f6c Mon Sep 17 00:00:00 2001
From: Josef Harte <josefharte@Josefs-MacBook-Pro.local>
Date: Tue, 19 May 2026 10:13:43 +0100
Subject: [PATCH 2/2] fix boolean value

---
 .../cluster/instance/ibm-aiservice-tenant.yaml.j2               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 827070095c..0002c791f8 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
@@ -8,7 +8,7 @@ ibm_aiservice_tenant:
   catalog_channel: "{{ CATALOG_CHANNEL }}"
   catalog_source: "{{ CATALOG_SOURCE }}"
   tenantNamespace: "{{ TENANT_NAMESPACE }}"
-  enable_deprovisioning: "{{ AISERVICE_ENABLE_DEPROVISIONING }}"
+  enable_deprovisioning: {{ AISERVICE_ENABLE_DEPROVISIONING }}
 
   mas_icr_cp: "{{ MAS_ICR_CP }}"
   mas_icr_cpopen: "{{ MAS_ICR_CPOPEN }}"