helm pre-hook annotations

giantswarm · Dec 18, 2024 · ae1a5de · ae1a5de
1 parent f6116d3
commit ae1a5de
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 17 deletions.
diff --git a/diffs/helm__envoy-gateway__templates__certgen-cnp.yaml.patch b/diffs/helm__envoy-gateway__templates__certgen-cnp.yaml.patch
@@ -1,15 +1,19 @@
 diff --git a/helm/envoy-gateway/templates/certgen-cnp.yaml b/helm/envoy-gateway/templates/certgen-cnp.yaml
 new file mode 100644
-index 0000000..03bf520
+index 0000000..d3ce4f6
 --- /dev/null
 +++ b/helm/envoy-gateway/templates/certgen-cnp.yaml
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,32 @@
 +---
 +apiVersion: "cilium.io/v2"
 +kind: CiliumNetworkPolicy
 +metadata:
 +  name: {{ include "eg.fullname" . }}-certgen
 +  namespace: {{ .Release.Namespace }}
++  annotations:
++    "helm.sh/hook": "pre-install,pre-upgrade"
++    "helm.sh/hook-weight": "-10"
++    "helm.sh/hook-delete-policy": "before-hook-creation"
 +  labels:
 +    app.kubernetes.io/component: "certgen"
 +    {{- include "eg.labels" . | nindent 4 }}
@@ -32,3 +36,4 @@ index 0000000..03bf520
 +              protocol: UDP
 +            - port: "53"
 +              protocol: TCP
+\ No newline at end of file
diff --git a/diffs/helm__envoy-gateway__templates__certgen-netpol.yaml.patch b/diffs/helm__envoy-gateway__templates__certgen-netpol.yaml.patch
@@ -1,15 +1,19 @@
 diff --git a/helm/envoy-gateway/templates/certgen-netpol.yaml b/helm/envoy-gateway/templates/certgen-netpol.yaml
 new file mode 100644
-index 0000000..27b8842
+index 0000000..54ec43e
 --- /dev/null
 +++ b/helm/envoy-gateway/templates/certgen-netpol.yaml
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,37 @@
 +---
 +apiVersion: networking.k8s.io/v1
 +kind: NetworkPolicy
 +metadata:
 +  name: {{ include "eg.fullname" . }}-certgen
 +  namespace: {{ .Release.Namespace }}
++  annotations:
++    "helm.sh/hook": "pre-install,pre-upgrade"
++    "helm.sh/hook-weight": "-10"
++    "helm.sh/hook-delete-policy": "before-hook-creation"
 +  labels:
 +    app.kubernetes.io/component: "certgen"
 +    {{- include "eg.labels" . | nindent 4 }}

diff --git a/diffs/helm__envoy-gateway__templates__envoy-gateway-cnp.yaml.patch b/diffs/helm__envoy-gateway__templates__envoy-gateway-cnp.yaml.patch
@@ -1,15 +1,19 @@
 diff --git a/helm/envoy-gateway/templates/envoy-gateway-cnp.yaml b/helm/envoy-gateway/templates/envoy-gateway-cnp.yaml
 new file mode 100644
-index 0000000..1b8f5dd
+index 0000000..a44b6ee
 --- /dev/null
 +++ b/helm/envoy-gateway/templates/envoy-gateway-cnp.yaml
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,41 @@
 +---
 +apiVersion: "cilium.io/v2"
 +kind: CiliumNetworkPolicy
 +metadata:
 +  name: {{ include "eg.fullname" . }}
 +  namespace: {{ .Release.Namespace }}
++  annotations:
++    "helm.sh/hook": "pre-install,pre-upgrade"
++    "helm.sh/hook-weight": "-10"
++    "helm.sh/hook-delete-policy": "before-hook-creation"
 +  labels:
 +    control-plane: envoy-gateway
 +    {{- include "eg.labels" . | nindent 4 }}

diff --git a/diffs/helm__envoy-gateway__templates__envoy-gateway-netpol.yaml.patch b/diffs/helm__envoy-gateway__templates__envoy-gateway-netpol.yaml.patch
@@ -1,15 +1,19 @@
 diff --git a/helm/envoy-gateway/templates/envoy-gateway-netpol.yaml b/helm/envoy-gateway/templates/envoy-gateway-netpol.yaml
 new file mode 100644
-index 0000000..37d3be0
+index 0000000..9d9049d
 --- /dev/null
 +++ b/helm/envoy-gateway/templates/envoy-gateway-netpol.yaml
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,45 @@
 +---
 +apiVersion: networking.k8s.io/v1
 +kind: NetworkPolicy
 +metadata:
 +  name: {{ include "eg.fullname" . }}
 +  namespace: {{ .Release.Namespace }}
++  annotations:
++    "helm.sh/hook": "pre-install,pre-upgrade"
++    "helm.sh/hook-weight": "-10"
++    "helm.sh/hook-delete-policy": "before-hook-creation"
 +  labels:
 +    control-plane: envoy-gateway
 +    {{- include "eg.labels" . | nindent 4 }}

diff --git a/helm/envoy-gateway/templates/certgen-cnp.yaml b/helm/envoy-gateway/templates/certgen-cnp.yaml
@@ -4,6 +4,10 @@ kind: CiliumNetworkPolicy
 metadata:
   name: {{ include "eg.fullname" . }}-certgen
   namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-weight": "-10"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
   labels:
     app.kubernetes.io/component: "certgen"
     {{- include "eg.labels" . | nindent 4 }}
@@ -25,4 +29,4 @@ spec:
             - port: "53"
               protocol: UDP
             - port: "53"
-              protocol: TCP
+              protocol: TCP
diff --git a/helm/envoy-gateway/templates/certgen-netpol.yaml b/helm/envoy-gateway/templates/certgen-netpol.yaml
@@ -4,6 +4,10 @@ kind: NetworkPolicy
 metadata:
   name: {{ include "eg.fullname" . }}-certgen
   namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-weight": "-10"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
   labels:
     app.kubernetes.io/component: "certgen"
     {{- include "eg.labels" . | nindent 4 }}

diff --git a/helm/envoy-gateway/templates/envoy-gateway-cnp.yaml b/helm/envoy-gateway/templates/envoy-gateway-cnp.yaml
@@ -4,6 +4,10 @@ kind: CiliumNetworkPolicy
 metadata:
   name: {{ include "eg.fullname" . }}
   namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-weight": "-10"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
   labels:
     control-plane: envoy-gateway
     {{- include "eg.labels" . | nindent 4 }}

diff --git a/helm/envoy-gateway/templates/envoy-gateway-netpol.yaml b/helm/envoy-gateway/templates/envoy-gateway-netpol.yaml
@@ -4,6 +4,10 @@ kind: NetworkPolicy
 metadata:
   name: {{ include "eg.fullname" . }}
   namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-weight": "-10"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
   labels:
     control-plane: envoy-gateway
     {{- include "eg.labels" . | nindent 4 }}

diff --git a/sync/patches/network-policies/000-network-policies.patch b/sync/patches/network-policies/000-network-policies.patch
@@ -1,15 +1,19 @@
 diff --git a/helm/envoy-gateway/templates/certgen-cnp.yaml b/helm/envoy-gateway/templates/certgen-cnp.yaml
 new file mode 100644
-index 0000000..03bf520
+index 0000000..d3ce4f6
 --- /dev/null
 +++ b/helm/envoy-gateway/templates/certgen-cnp.yaml
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,32 @@
 +---
 +apiVersion: "cilium.io/v2"
 +kind: CiliumNetworkPolicy
 +metadata:
 +  name: {{ include "eg.fullname" . }}-certgen
 +  namespace: {{ .Release.Namespace }}
++  annotations:
++    "helm.sh/hook": "pre-install,pre-upgrade"
++    "helm.sh/hook-weight": "-10"
++    "helm.sh/hook-delete-policy": "before-hook-creation"
 +  labels:
 +    app.kubernetes.io/component: "certgen"
 +    {{- include "eg.labels" . | nindent 4 }}
@@ -32,18 +36,23 @@ index 0000000..03bf520
 +              protocol: UDP
 +            - port: "53"
 +              protocol: TCP
+\ No newline at end of file
 diff --git a/helm/envoy-gateway/templates/certgen-netpol.yaml b/helm/envoy-gateway/templates/certgen-netpol.yaml
 new file mode 100644
-index 0000000..27b8842
+index 0000000..54ec43e
 --- /dev/null
 +++ b/helm/envoy-gateway/templates/certgen-netpol.yaml
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,37 @@
 +---
 +apiVersion: networking.k8s.io/v1
 +kind: NetworkPolicy
 +metadata:
 +  name: {{ include "eg.fullname" . }}-certgen
 +  namespace: {{ .Release.Namespace }}
++  annotations:
++    "helm.sh/hook": "pre-install,pre-upgrade"
++    "helm.sh/hook-weight": "-10"
++    "helm.sh/hook-delete-policy": "before-hook-creation"
 +  labels:
 +    app.kubernetes.io/component: "certgen"
 +    {{- include "eg.labels" . | nindent 4 }}
@@ -73,16 +82,20 @@ index 0000000..27b8842
 +              k8s-app: kube-dns
 diff --git a/helm/envoy-gateway/templates/envoy-gateway-cnp.yaml b/helm/envoy-gateway/templates/envoy-gateway-cnp.yaml
 new file mode 100644
-index 0000000..1b8f5dd
+index 0000000..a44b6ee
 --- /dev/null
 +++ b/helm/envoy-gateway/templates/envoy-gateway-cnp.yaml
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,41 @@
 +---
 +apiVersion: "cilium.io/v2"
 +kind: CiliumNetworkPolicy
 +metadata:
 +  name: {{ include "eg.fullname" . }}
 +  namespace: {{ .Release.Namespace }}
++  annotations:
++    "helm.sh/hook": "pre-install,pre-upgrade"
++    "helm.sh/hook-weight": "-10"
++    "helm.sh/hook-delete-policy": "before-hook-creation"
 +  labels:
 +    control-plane: envoy-gateway
 +    {{- include "eg.labels" . | nindent 4 }}
@@ -116,16 +129,20 @@ index 0000000..1b8f5dd
 +            {{- end }}
 diff --git a/helm/envoy-gateway/templates/envoy-gateway-netpol.yaml b/helm/envoy-gateway/templates/envoy-gateway-netpol.yaml
 new file mode 100644
-index 0000000..37d3be0
+index 0000000..9d9049d
 --- /dev/null
 +++ b/helm/envoy-gateway/templates/envoy-gateway-netpol.yaml
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,45 @@
 +---
 +apiVersion: networking.k8s.io/v1
 +kind: NetworkPolicy
 +metadata:
 +  name: {{ include "eg.fullname" . }}
 +  namespace: {{ .Release.Namespace }}
++  annotations:
++    "helm.sh/hook": "pre-install,pre-upgrade"
++    "helm.sh/hook-weight": "-10"
++    "helm.sh/hook-delete-policy": "before-hook-creation"
 +  labels:
 +    control-plane: envoy-gateway
 +    {{- include "eg.labels" . | nindent 4 }}