Merge branch 'main' of https://github.com/sassoftware/viya4-deployment into pr-pscloud-64

Author: Abhishek Kumar

roles/baseline/tasks/contour.yaml

@@ -92,12 +92,26 @@
     - install
     - update
 
-# Restart Contour deployment to apply the compression configuration changes
+# Dynamically fetch the actual Contour deployment name.
+- name: Get Contour deployment name
+  kubernetes.core.k8s_info:
+    kind: Deployment
+    namespace: "{{ CONTOUR_NAMESPACE }}"
+    kubeconfig: "{{ KUBECONFIG }}"
+    label_selectors:
+      - "app.kubernetes.io/name=contour"
+      - "app.kubernetes.io/component=contour"
+  register: contour_deploy_info
+  tags:
+    - install
+    - update
+
+# Restart the discovered Contour deployment to apply the compression configuration changes
 - name: Restart Contour deployment
   kubernetes.core.k8s:
     state: patched
     kind: Deployment
-    name: "{{ CONTOUR_NAME }}"
+    name: "{{ contour_deploy_info.resources[0].metadata.name }}"
     namespace: "{{ CONTOUR_NAMESPACE }}"
     kubeconfig: "{{ KUBECONFIG }}"
     definition:
@@ -106,6 +120,7 @@
           metadata:
             annotations:
               kubectl.kubernetes.io/restartedAt: "{{ ansible_date_time.iso8601 }}"
+  when: contour_deploy_info.resources | length > 0
   tags:
     - install
     - update

roles/baseline/tasks/main.yaml

@@ -77,6 +77,8 @@
     - K8S_VERSION|float >= 1.23
     - EBS_CSI_DRIVER_ACCOUNT is defined
     - EBS_CSI_DRIVER_ACCOUNT is not none
+    - V4_CFG_MANAGE_STORAGE is defined
+    - V4_CFG_MANAGE_STORAGE|bool
   tags:
     - baseline