Add helm hooks for ordering spire-agent and spire-server deployment (#…

…954) Make spire-agent always deploy after spire-server to avoid restarts Signed-off-by: Qi Hu <[email protected]>
vmware-tanzu · May 5, 2024 · e1f53ae · e1f53ae
1 parent c862fbd
commit e1f53ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/helm-charts/0.25.2/charts/spire/templates/spire-agent-daemonset.yaml b/helm-charts/0.25.2/charts/spire/templates/spire-agent-daemonset.yaml
@@ -15,6 +15,7 @@ metadata:
   namespace: {{ .Values.global.spire.namespace }}
   labels:
     app: spire-agent
+  annotations: {{ .Values.spireAgent.annotations | toYaml | nindent 4 }}
 spec:
   selector:
     matchLabels:

diff --git a/helm-charts/0.25.2/charts/spire/values.yaml b/helm-charts/0.25.2/charts/spire/values.yaml
@@ -52,6 +52,12 @@ serviceAccount:
 
 podAnnotations: {}
 
+spireAgent:
+  annotations: 
+    # Define a helm hook to make spire-agent daemonSet deploy after spire-server statefulSet
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": hook-succeeded
+
 podSecurityContext: {}
   # fsGroup: 2000