Merge branch 'stable' into update-251127

Author: anilprajapatiibm

src/mas/devops/tekton.py

@@ -362,7 +362,7 @@ def launchUninstallPipeline(dynClient: DynamicClient,
                             uninstallGrafana: bool = False,
                             uninstallCatalog: bool = False,
                             uninstallCommonServices: bool = False,
-                            uninstallUDS: bool = False,
+                            uninstallDRO: bool = False,
                             uninstallMongoDb: bool = False,
                             uninstallSLS: bool = False) -> str:
     """
@@ -384,7 +384,7 @@ def launchUninstallPipeline(dynClient: DynamicClient,
     ibmCatalogAction = "uninstall" if uninstallCatalog else "none"
     mongoDbAction = "uninstall" if uninstallMongoDb else "none"
     slsAction = "uninstall" if uninstallSLS else "none"
-    udsAction = "uninstall" if uninstallUDS else "none"
+    droAction = "uninstall" if uninstallDRO else "none"
 
     # Render the pipelineRun
     renderedTemplate = template.render(
@@ -397,7 +397,7 @@ def launchUninstallPipeline(dynClient: DynamicClient,
         ibm_catalogs_action=ibmCatalogAction,
         mongodb_action=mongoDbAction,
         sls_action=slsAction,
-        uds_action=udsAction,
+        dro_action=droAction,
         dro_namespace=droNamespace
     )
     logger.debug(renderedTemplate)

src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2

@@ -143,16 +143,16 @@ spec:
       value: "{{ aiservice_sls_ca_cert }}"
 {%- endif %}
 
-    # Dependencies - UDS/DRO (Required)
+    # Dependencies - DRO (Required)
     # -------------------------------------------------------------------------
-    - name: uds_action
-      value: "{{ uds_action }}"
-    - name: uds_contact_email
-      value: "{{ uds_contact_email }}"
-    - name: uds_contact_firstname
-      value: "{{ uds_contact_firstname }}"
-    - name: uds_contact_lastname
-      value: "{{ uds_contact_lastname }}"
+    - name: dro_action
+      value: "{{ dro_action }}"
+    - name: dro_contact_email
+      value: "{{ dro_contact_email }}"
+    - name: dro_contact_firstname
+      value: "{{ dro_contact_firstname }}"
+    - name: dro_contact_lastname
+      value: "{{ dro_contact_lastname }}"
 {%- if dro_namespace is defined and dro_namespace != "" %}
     - name: dro_namespace
       value: "{{ dro_namespace }}"

src/mas/devops/templates/pipelinerun-install.yml.j2

@@ -314,16 +314,16 @@ spec:
 {%- endif %}
 
 
-    # Dependencies - UDS/DRO (Required)
-    # -------------------------------------------------------------------------
-    - name: uds_action
-      value: "{{ uds_action }}"
-    - name: uds_contact_email
-      value: "{{ uds_contact_email }}"
-    - name: uds_contact_firstname
-      value: "{{ uds_contact_firstname }}"
-    - name: uds_contact_lastname
-      value: "{{ uds_contact_lastname }}"
+    # Dependencies - DRO (Required)
+    # -------------------------------------------------------------------------
+    - name: dro_action
+      value: "{{ dro_action }}"
+    - name: dro_contact_email
+      value: "{{ dro_contact_email }}"
+    - name: dro_contact_firstname
+      value: "{{ dro_contact_firstname }}"
+    - name: dro_contact_lastname
+      value: "{{ dro_contact_lastname }}"
 {%- if dro_namespace is defined and dro_namespace != "" %}
     - name: dro_namespace
       value: "{{ dro_namespace }}"

src/mas/devops/templates/pipelinerun-uninstall.yml.j2

@@ -30,8 +30,8 @@ spec:
       value: {{ mongodb_action }}
     - name: sls_action
       value: {{ sls_action }}
-    - name: uds_action
-      value: {{ uds_action }}
+    - name: dro_action
+      value: {{ dro_action }}
     - name: dro_namespace
       value: {{ dro_namespace }}
 

src/mas/devops/templates/pipelinerun-update.yml.j2

@@ -92,19 +92,6 @@ spec:
     - name: cert_manager_action
       value: "{{ cert_manager_action }}"
 {%- endif %}
-{%- if dro_migration is defined and dro_migration != "" %}
-
-    # UDS to DRO migration
-    # -------------------------------------------------------------------------
-    - name: dro_migration
-      value: "{{ dro_migration }}"
-    - name: uds_storage_class
-      value: "{{ dro_storage_class }}"
-    - name: uds_action
-      value: "{{ uds_action }}"
-    - name: dro_namespace
-      value: "{{ dro_namespace }}"
-{%- endif %}
 {%- if grafana_v5_upgrade is defined and grafana_v5_upgrade != "" %}
 
     # Grafana