From a82ee694bf0edb8378eac3d039b8765583d500d0 Mon Sep 17 00:00:00 2001
From: Kevin Fox <Kevin.Fox@pnnl.gov>
Date: Thu, 2 Mar 2023 11:08:27 -0800
Subject: [PATCH] Make sure all configmap changes rollout

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
---
 .../spiffe-oidc-discovery-provider/templates/deployment.yaml    | 2 ++
 charts/spire/charts/spire-server/templates/statefulset.yaml     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml
index 3a193d2..7c7e078 100644
--- a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml
+++ b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{- $configSum := (include (print $.Template.BasePath "/configmap.yaml") . | sha256sum) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -15,6 +16,7 @@ spec:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
+        checksum/config: {{ $configSum }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
diff --git a/charts/spire/charts/spire-server/templates/statefulset.yaml b/charts/spire/charts/spire-server/templates/statefulset.yaml
index 45e7062..bf20868 100644
--- a/charts/spire/charts/spire-server/templates/statefulset.yaml
+++ b/charts/spire/charts/spire-server/templates/statefulset.yaml
@@ -1,4 +1,5 @@
 {{- $configSum := (include (print $.Template.BasePath "/configmap.yaml") . | sha256sum) }}
+{{- $configSum2 := (include (print $.Template.BasePath "/controller-manager-configmap.yaml") . | sha256sum) }}
 {{- $fullname := include "spire-server.fullname" . }}
 apiVersion: apps/v1
 kind: StatefulSet
@@ -18,6 +19,7 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ $configSum }}
+        checksum/config2: {{ $configSum2 }}
         {{- with .Values.podAnnotations }}
           {{- toYaml . | nindent 8 }}
         {{- end }}