From bfb2d07e3f63669749f2fb75c3f2cadbc8687e03 Mon Sep 17 00:00:00 2001
From: David Parker <parkerda@uk.ibm.com>
Date: Wed, 19 Nov 2025 13:20:41 +0000
Subject: [PATCH 1/2] [major] Remove deprecated IBM Common Services support

---
 src/mas/devops/tekton.py                              | 5 -----
 src/mas/devops/templates/pipelinerun-uninstall.yml.j2 | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py
index 4f049d10..e408e141 100644
--- a/src/mas/devops/tekton.py
+++ b/src/mas/devops/tekton.py
@@ -357,11 +357,9 @@ def launchUpgradePipeline(dynClient: DynamicClient,
 def launchUninstallPipeline(dynClient: DynamicClient,
                             instanceId: str,
                             droNamespace: str,
-                            certManagerProvider: str = "redhat",
                             uninstallCertManager: bool = False,
                             uninstallGrafana: bool = False,
                             uninstallCatalog: bool = False,
-                            uninstallCommonServices: bool = False,
                             uninstallDRO: bool = False,
                             uninstallMongoDb: bool = False,
                             uninstallSLS: bool = False) -> str:
@@ -380,7 +378,6 @@ def launchUninstallPipeline(dynClient: DynamicClient,
 
     grafanaAction = "uninstall" if uninstallGrafana else "none"
     certManagerAction = "uninstall" if uninstallCertManager else "none"
-    commonServicesAction = "uninstall" if uninstallCommonServices else "none"
     ibmCatalogAction = "uninstall" if uninstallCatalog else "none"
     mongoDbAction = "uninstall" if uninstallMongoDb else "none"
     slsAction = "uninstall" if uninstallSLS else "none"
@@ -391,9 +388,7 @@ def launchUninstallPipeline(dynClient: DynamicClient,
         timestamp=timestamp,
         mas_instance_id=instanceId,
         grafana_action=grafanaAction,
-        cert_manager_provider=certManagerProvider,
         cert_manager_action=certManagerAction,
-        common_services_action=commonServicesAction,
         ibm_catalogs_action=ibmCatalogAction,
         mongodb_action=mongoDbAction,
         sls_action=slsAction,
diff --git a/src/mas/devops/templates/pipelinerun-uninstall.yml.j2 b/src/mas/devops/templates/pipelinerun-uninstall.yml.j2
index 8b1496cf..5689fd62 100644
--- a/src/mas/devops/templates/pipelinerun-uninstall.yml.j2
+++ b/src/mas/devops/templates/pipelinerun-uninstall.yml.j2
@@ -18,12 +18,8 @@ spec:
       value: {{ mas_instance_id }}
     - name: grafana_action
       value: {{ grafana_action }}
-    - name: cert_manager_provider
-      value: {{ cert_manager_provider }}
     - name: cert_manager_action
       value: {{ cert_manager_action }}
-    - name: common_services_action
-      value: {{ common_services_action }}
     - name: ibm_catalogs_action
       value: {{ ibm_catalogs_action }}
     - name: mongodb_action

From 70815c41536bee8121b88d3f4af1d5615e0cbb5c Mon Sep 17 00:00:00 2001
From: David Parker <parkerda@uk.ibm.com>
Date: Wed, 19 Nov 2025 14:31:14 +0000
Subject: [PATCH 2/2] Remove openscale and spss

---
 src/mas/devops/templates/pipelinerun-install.yml.j2 | 4 ----
 src/mas/devops/templates/pipelinerun-update.yml.j2  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2
index fa7f7244..1c4797f7 100644
--- a/src/mas/devops/templates/pipelinerun-install.yml.j2
+++ b/src/mas/devops/templates/pipelinerun-install.yml.j2
@@ -274,10 +274,6 @@ spec:
     # -------------------------------------------------------------------------
     - name: cpd_product_version
       value: "{{ cpd_product_version }}"
-    - name: cpd_install_spss
-      value: "{{ cpd_install_spss }}"
-    - name: cpd_install_openscale
-      value: "{{ cpd_install_openscale }}"
     - name: cpd_install_cognos
       value: "{{ cpd_install_cognos }}"
     - name: cpd_install_ws
diff --git a/src/mas/devops/templates/pipelinerun-update.yml.j2 b/src/mas/devops/templates/pipelinerun-update.yml.j2
index c399e14c..83be320e 100644
--- a/src/mas/devops/templates/pipelinerun-update.yml.j2
+++ b/src/mas/devops/templates/pipelinerun-update.yml.j2
@@ -114,12 +114,8 @@ spec:
       value: "{{ cp4d_update_ws }}"
     - name: cp4d_update_wml
       value: "{{ cp4d_update_wml }}"
-    - name: cp4d_update_wos
-      value: "{{ cp4d_update_wos }}"
     - name: cp4d_update_spark
       value: "{{ cp4d_update_spark }}"
-    - name: cp4d_update_spss
-      value: "{{ cp4d_update_spss }}"
     - name: cp4d_update_cognos
       value: "{{ cp4d_update_cognos }}"