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

Author: bert-e

buildchain/buildchain/salt_tree.py

@@ -409,6 +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/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"),
@@ -430,6 +431,7 @@ 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,2 +1,3 @@
 include:
+  - .ui-operator-prepare
   - .ui-operator-cr

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

@@ -0,0 +1,43 @@
+# This can file can be removed in v132.0.0
+
+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

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

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

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

@@ -0,0 +1,29 @@
+# This can file can be removed in v132.0.0
+
+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