Merge branch 'improvement/remove-legacy-resources-before-install' into q/131.0

Author: bert-e

buildchain/buildchain/salt_tree.py

@@ -409,7 +409,7 @@ def _download_ui_operator_crds() -> str:
     Path("salt/metalk8s/addons/ui/deployed/ingress.sls"),
     Path("salt/metalk8s/addons/ui/deployed/init.sls"),
     Path("salt/metalk8s/addons/ui/deployed/ui-operator-cr.sls"),
-    Path("salt/metalk8s/addons/ui/deployed/ui-operator-prepare.sls"),
+    Path("salt/metalk8s/addons/ui/deployed/ui-operator-post-install.sls"),
     Path("salt/metalk8s/addons/ui/config/metalk8s-ui-config.yaml.j2"),
     Path("salt/metalk8s/addons/ui/config/metalk8s-shell-ui-config.yaml.j2"),
     Path("salt/metalk8s/addons/ui/config/workloadplane-shell-ui-config.yaml.j2"),
@@ -431,7 +431,6 @@ def _download_ui_operator_crds() -> str:
     Path("salt/metalk8s/addons/ui-operator/post-upgrade.sls"),
     Path("salt/metalk8s/addons/shell-ui/deployed/init.sls"),
     Path("salt/metalk8s/addons/shell-ui/deployed/ui-operator-cr.sls"),
-    Path("salt/metalk8s/addons/shell-ui/deployed/ui-operator-prepare.sls"),
     Path("salt/metalk8s/addons/solutions/deployed/configmap.sls"),
     Path("salt/metalk8s/addons/solutions/deployed/init.sls"),
     Path("salt/metalk8s/addons/solutions/deployed/namespace.sls"),

salt/metalk8s/addons/shell-ui/deployed/init.sls

@@ -1,3 +1,2 @@
 include:
-  - .ui-operator-prepare
   - .ui-operator-cr

salt/metalk8s/addons/shell-ui/deployed/ui-operator-prepare.sls

@@ -1,5 +1,5 @@
 include:
 - .dependencies
-- .ui-operator-prepare
 - .ui-operator-cr
+- .ui-operator-post-install
 - .ingress

salt/metalk8s/addons/ui/deployed/init.sls

@@ -0,0 +1,105 @@
+{%- set metalk8s_ui_deployment = salt.metalk8s_kubernetes.get_object(
+        kind='Deployment',
+        apiVersion='apps/v1',
+        namespace='metalk8s-ui',
+        name='metalk8s-ui',
+  )
+%}
+
+{%- if metalk8s_ui_deployment %}
+
+Remove legacy volumes and volumeMounts from metalk8s-ui deployment:
+    metalk8s_kubernetes.object_updated:
+        - apiVersion: apps/v1
+        - kind: Deployment
+        - name: metalk8s-ui
+        - namespace: metalk8s-ui
+        - patch:
+          - op: replace
+            path: /spec/template/spec/containers/0/volumeMounts
+            value:
+            - name: config-volume-metalk8s-ui
+              mountPath: /usr/share/nginx/html/.well-known/configs
+              readOnly: true
+          - op: replace
+            path: /spec/template/spec/volumes
+            value:
+            - name: config-volume-metalk8s-ui
+              configMap:
+                name: metalk8s-ui-runtime-app-configuration
+                defaultMode: 420
+        - content_type: application/json-patch+json
+
+{%- endif %}
+
+Delete old metalk8s-ui ingress:
+    metalk8s_kubernetes.object_absent:
+        - apiVersion: networking.k8s.io/v1
+        - kind: Ingress
+        - name: metalk8s-ui
+        - namespace: metalk8s-ui
+
+Delete old metalk8s-shell-ui-config configmap:
+    metalk8s_kubernetes.object_absent:
+        - apiVersion: v1
+        - kind: ConfigMap
+        - name: metalk8s-shell-ui-config
+        - namespace: metalk8s-ui
+
+Delete old metalk8s-ui configmap:
+    metalk8s_kubernetes.object_absent:
+        - apiVersion: v1
+        - kind: ConfigMap
+        - name: metalk8s-ui
+        - namespace: metalk8s-ui
+
+Delete old metalk8s-ui-config configmap:
+    metalk8s_kubernetes.object_absent:
+        - apiVersion: v1
+        - kind: ConfigMap
+        - name: metalk8s-ui-config
+        - namespace: metalk8s-ui
+
+# Remove legacy shell-ui configmaps after to avoid interruptions during upgrade
+
+Delete old shell-ui configmap:
+    metalk8s_kubernetes.object_absent:
+        - apiVersion: v1
+        - kind: ConfigMap
+        - name: shell-ui-config
+        - namespace: metalk8s-ui
+
+Delete legacy deployed-ui-apps configmap:
+    metalk8s_kubernetes.object_absent:
+        - apiVersion: v1
+        - kind: ConfigMap
+        - name: deployed-ui-apps
+        - namespace: metalk8s-ui
+
+Delete legacy deployed-ui-apps-generated configmap:
+    metalk8s_kubernetes.object_absent:
+        - apiVersion: v1
+        - kind: ConfigMap
+        - name: deployed-ui-apps-generated
+        - namespace: metalk8s-ui
+
+Delete legacy shell-ui configmap:
+    metalk8s_kubernetes.object_absent:
+        - apiVersion: v1
+        - kind: ConfigMap
+        - name: shell-ui
+        - namespace: metalk8s-ui
+
+Delete legacy workloadplane-shell-ui-config configmap:
+    metalk8s_kubernetes.object_absent:
+        - apiVersion: v1
+        - kind: ConfigMap
+        - name: workloadplane-shell-ui-config
+        - namespace: metalk8s-ui
+
+Delete legacy workloadplane-shell-ui-config-generated configmap:
+    metalk8s_kubernetes.object_absent:
+        - apiVersion: v1
+        - kind: ConfigMap
+        - name: workloadplane-shell-ui-config-generated
+        - namespace: metalk8s-ui