Order ui-server installer hooks in ocm mode

Signed-off-by: Tamal Saha <[email protected]>
kubeops · Jan 13, 2024 · 9410df6 · 9410df6
1 parent f30df4d
commit 9410df6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/charts/kube-ui-server/templates/ocm-mc/apiregistration.yaml b/charts/kube-ui-server/templates/ocm-mc/apiregistration.yaml
@@ -37,8 +37,9 @@ metadata:
   labels:
     {{- include "kube-ui-server.labels" . | nindent 4 }}
   annotations:
+    "helm.sh/hook-weight": "3"
     "helm.sh/hook": post-install,post-upgrade,post-rollback
-    # "helm.sh/hook-delete-policy": hook-succeeded,hook-failed
+    "helm.sh/hook-delete-policy": hook-succeeded,hook-failed
 spec:
   ttlSecondsAfterFinished: 0
   backoffLimit: 3

diff --git a/charts/kube-ui-server/templates/ocm-mc/crds.yaml b/charts/kube-ui-server/templates/ocm-mc/crds.yaml
@@ -12,6 +12,7 @@ metadata:
   labels:
     {{- include "kube-ui-server.labels" $ | nindent 4 }}
   annotations:
+    "helm.sh/hook-weight": "0"
     "helm.sh/hook": post-install,post-upgrade,post-rollback
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 data:
@@ -27,6 +28,7 @@ metadata:
   labels:
     {{- include "kube-ui-server.labels" $ | nindent 4 }}
   annotations:
+    "helm.sh/hook-weight": "1"
     "helm.sh/hook": post-install,post-upgrade,post-rollback
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 spec:

diff --git a/charts/kube-ui-server/templates/ocm-mc/svc.yaml b/charts/kube-ui-server/templates/ocm-mc/svc.yaml
@@ -8,8 +8,9 @@ metadata:
   labels:
     {{- include "kube-ui-server.labels" $ | nindent 4 }}
   annotations:
+    "helm.sh/hook-weight": "2"
     "helm.sh/hook": post-install,post-upgrade,post-rollback
-    # "helm.sh/hook-delete-policy": hook-succeeded,hook-failed
+    "helm.sh/hook-delete-policy": hook-succeeded,hook-failed
 spec:
   ttlSecondsAfterFinished: 0
   backoffLimit: 3