Skip to content

Commit 6d83cfe

Browse files
committed
remove shell configuration after metalk8s-ui update to avoid service interruption during upgrade
1 parent 009ff43 commit 6d83cfe

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

buildchain/buildchain/salt_tree.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ def _download_ui_operator_crds() -> str:
409409
Path("salt/metalk8s/addons/ui/deployed/ingress.sls"),
410410
Path("salt/metalk8s/addons/ui/deployed/init.sls"),
411411
Path("salt/metalk8s/addons/ui/deployed/ui-operator-cr.sls"),
412-
Path("salt/metalk8s/addons/ui/deployed/ui-operator-prepare.sls"),
412+
Path("salt/metalk8s/addons/ui/deployed/ui-operator-post-install.sls"),
413413
Path("salt/metalk8s/addons/ui/config/metalk8s-ui-config.yaml.j2"),
414414
Path("salt/metalk8s/addons/ui/config/metalk8s-shell-ui-config.yaml.j2"),
415415
Path("salt/metalk8s/addons/ui/config/workloadplane-shell-ui-config.yaml.j2"),
@@ -431,7 +431,6 @@ def _download_ui_operator_crds() -> str:
431431
Path("salt/metalk8s/addons/ui-operator/post-upgrade.sls"),
432432
Path("salt/metalk8s/addons/shell-ui/deployed/init.sls"),
433433
Path("salt/metalk8s/addons/shell-ui/deployed/ui-operator-cr.sls"),
434-
Path("salt/metalk8s/addons/shell-ui/deployed/ui-operator-prepare.sls"),
435434
Path("salt/metalk8s/addons/solutions/deployed/configmap.sls"),
436435
Path("salt/metalk8s/addons/solutions/deployed/init.sls"),
437436
Path("salt/metalk8s/addons/solutions/deployed/namespace.sls"),

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

Lines changed: 0 additions & 43 deletions
This file was deleted.

salt/metalk8s/addons/ui/deployed/ui-operator-post-install.sls

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Remove legacy volumes and volumeMounts from metalk8s-ui deployment:
1919
- name: config-volume-metalk8s-ui
2020
configMap:
2121
name: metalk8s-ui-runtime-app-configuration
22-
defaultMode: 420
22+
defaultMode: 420
2323
- content_type: application/merge-patch+json
2424

2525
Delete old metalk8s-ui ingress:
@@ -49,3 +49,47 @@ Delete old metalk8s-ui-config configmap:
4949
- kind: ConfigMap
5050
- name: metalk8s-ui-config
5151
- namespace: metalk8s-ui
52+
53+
# Remove legacy shell-ui configmaps after to avoid interruptions during upgrade
54+
55+
Delete old shell-ui configmap:
56+
metalk8s_kubernetes.object_absent:
57+
- apiVersion: v1
58+
- kind: ConfigMap
59+
- name: shell-ui-config
60+
- namespace: metalk8s-ui
61+
62+
Delete legacy deployed-ui-apps configmap:
63+
metalk8s_kubernetes.object_absent:
64+
- apiVersion: v1
65+
- kind: ConfigMap
66+
- name: deployed-ui-apps
67+
- namespace: metalk8s-ui
68+
69+
Delete legacy deployed-ui-apps-generated configmap:
70+
metalk8s_kubernetes.object_absent:
71+
- apiVersion: v1
72+
- kind: ConfigMap
73+
- name: deployed-ui-apps-generated
74+
- namespace: metalk8s-ui
75+
76+
Delete legacy shell-ui configmap:
77+
metalk8s_kubernetes.object_absent:
78+
- apiVersion: v1
79+
- kind: ConfigMap
80+
- name: shell-ui
81+
- namespace: metalk8s-ui
82+
83+
Delete legacy workloadplane-shell-ui-config configmap:
84+
metalk8s_kubernetes.object_absent:
85+
- apiVersion: v1
86+
- kind: ConfigMap
87+
- name: workloadplane-shell-ui-config
88+
- namespace: metalk8s-ui
89+
90+
Delete legacy workloadplane-shell-ui-config-generated configmap:
91+
metalk8s_kubernetes.object_absent:
92+
- apiVersion: v1
93+
- kind: ConfigMap
94+
- name: workloadplane-shell-ui-config-generated
95+
- namespace: metalk8s-ui

0 commit comments

Comments
 (0)