Use non-default namespace for KubeVirt chart hooks (#58)

suse-edge · Dec 6, 2023 · 9bc9f5b · 9bc9f5b
1 parent 0d71fa7
commit 9bc9f5b
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 34 deletions.
diff --git a/assets/kubevirt/kubevirt-0.2.0.tgz b/assets/kubevirt/kubevirt-0.2.0.tgz
diff --git a/charts/kubevirt/0.2.0/templates/kubevirt-crd-uninstall.yaml b/charts/kubevirt/0.2.0/templates/kubevirt-crd-uninstall.yaml
@@ -1,12 +1,21 @@
 apiVersion: v1
+kind: Namespace
+metadata:
+  name: kubevirt-crd-uninstall
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-weight": "1"
+---
+apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: default
+  namespace: kubevirt-crd-uninstall
   name: kubevirt-crd-uninstaller
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "1"
+    "helm.sh/hook-weight": "2"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -15,7 +24,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "1"
+    "helm.sh/hook-weight": "2"
 rules:
   - apiGroups: [ "apiextensions.k8s.io" ]
     resources: [ "customresourcedefinitions" ]
@@ -30,10 +39,10 @@ metadata:
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "3"
 subjects:
   - kind: ServiceAccount
-    namespace: default
+    namespace: kubevirt-crd-uninstall
     name: kubevirt-crd-uninstaller
 roleRef:
   kind: ClusterRole
@@ -43,12 +52,12 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: default
+  namespace: kubevirt-crd-uninstall
   name: kubevirt-crd-uninstaller
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-weight": "4"
 spec:
   template:
     metadata:

diff --git a/charts/kubevirt/0.2.0/templates/kubevirt-crd-upgrade.yaml b/charts/kubevirt/0.2.0/templates/kubevirt-crd-upgrade.yaml
@@ -1,25 +1,34 @@
 apiVersion: v1
+kind: Namespace
+metadata:
+  name: kubevirt-crd-upgrade
+  annotations:
+    "helm.sh/hook": pre-upgrade
+    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-weight": "1"
+---
+apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: default
+  namespace: kubevirt-crd-upgrade
   name: kubevirt-crd-manifest
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "1"
+    "helm.sh/hook-weight": "2"
 data:
   crd: |-
     {{ $.Files.Get "crds/kubevirt.yaml" | nindent 4 }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: default
+  namespace: kubevirt-crd-upgrade
   name: kubevirt-crd-upgrader
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "3"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -28,7 +37,7 @@ metadata:
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "3"
 rules:
   - apiGroups: [ "" ]
     resources: [ "configmaps" ]
@@ -48,10 +57,10 @@ metadata:
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-weight": "4"
 subjects:
   - kind: ServiceAccount
-    namespace: default
+    namespace: kubevirt-crd-upgrade
     name: kubevirt-crd-upgrader
 roleRef:
   kind: ClusterRole
@@ -61,12 +70,12 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: default
+  namespace: kubevirt-crd-upgrade
   name: kubevirt-crd-upgrader
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "4"
+    "helm.sh/hook-weight": "5"
 spec:
   template:
     metadata:

diff --git a/index.yaml b/index.yaml
@@ -61,9 +61,9 @@ entries:
   kubevirt:
   - apiVersion: v2
     appVersion: 1.1.0
-    created: "2023-12-05T15:31:08.609981+02:00"
+    created: "2023-12-06T13:39:17.572304+02:00"
     description: A Helm chart for KubeVirt
-    digest: 2441f1d2f3f835a8483f682ab49ceaa5a8fa4e8ea8a801d840ffd6fdb541ffe7
+    digest: c62cb510a7302f5f392860c9591fb02256e161fcac65b87898ed711f03cd30bd
     icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/kubevirt/icon/color/kubevirt-icon-color.svg
     name: kubevirt
     type: application

diff --git a/packages/kubevirt/charts/templates/kubevirt-crd-uninstall.yaml b/packages/kubevirt/charts/templates/kubevirt-crd-uninstall.yaml
@@ -1,12 +1,21 @@
 apiVersion: v1
+kind: Namespace
+metadata:
+  name: kubevirt-crd-uninstall
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-weight": "1"
+---
+apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: default
+  namespace: kubevirt-crd-uninstall
   name: kubevirt-crd-uninstaller
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "1"
+    "helm.sh/hook-weight": "2"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -15,7 +24,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "1"
+    "helm.sh/hook-weight": "2"
 rules:
   - apiGroups: [ "apiextensions.k8s.io" ]
     resources: [ "customresourcedefinitions" ]
@@ -30,10 +39,10 @@ metadata:
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "3"
 subjects:
   - kind: ServiceAccount
-    namespace: default
+    namespace: kubevirt-crd-uninstall
     name: kubevirt-crd-uninstaller
 roleRef:
   kind: ClusterRole
@@ -43,12 +52,12 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: default
+  namespace: kubevirt-crd-uninstall
   name: kubevirt-crd-uninstaller
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-weight": "4"
 spec:
   template:
     metadata:

diff --git a/packages/kubevirt/charts/templates/kubevirt-crd-upgrade.yaml b/packages/kubevirt/charts/templates/kubevirt-crd-upgrade.yaml
@@ -1,25 +1,34 @@
 apiVersion: v1
+kind: Namespace
+metadata:
+  name: kubevirt-crd-upgrade
+  annotations:
+    "helm.sh/hook": pre-upgrade
+    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-weight": "1"
+---
+apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: default
+  namespace: kubevirt-crd-upgrade
   name: kubevirt-crd-manifest
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "1"
+    "helm.sh/hook-weight": "2"
 data:
   crd: |-
     {{ $.Files.Get "crds/kubevirt.yaml" | nindent 4 }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: default
+  namespace: kubevirt-crd-upgrade
   name: kubevirt-crd-upgrader
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "3"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -28,7 +37,7 @@ metadata:
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "3"
 rules:
   - apiGroups: [ "" ]
     resources: [ "configmaps" ]
@@ -48,10 +57,10 @@ metadata:
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-weight": "4"
 subjects:
   - kind: ServiceAccount
-    namespace: default
+    namespace: kubevirt-crd-upgrade
     name: kubevirt-crd-upgrader
 roleRef:
   kind: ClusterRole
@@ -61,12 +70,12 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: default
+  namespace: kubevirt-crd-upgrade
   name: kubevirt-crd-upgrader
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "4"
+    "helm.sh/hook-weight": "5"
 spec:
   template:
     metadata: