Merge branch 'remove-rollme-external-configmap' into 'master'

Remove automatic rollme annotation with external config See merge request nvidia/kubernetes/device-plugin!185
NVIDIA · Jun 13, 2022 · 6a837d6 · 6a837d6
2 parents 9390708 + 2d6105e
commit 6a837d6
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/deployments/helm/nvidia-device-plugin/templates/_helpers.tpl b/deployments/helm/nvidia-device-plugin/templates/_helpers.tpl
@@ -190,12 +190,10 @@ Get the name of the configmap to use
 Pod annotations for the plugin and GFD
 */}}
 {{- define "nvidia-device-plugin.podAnnotations" -}}
-{{- $annotations := .local.Values.podAnnotations -}}
-{{- if not (hasKey $annotations "rollme") -}}
+{{- $annotations := deepCopy .local.Values.podAnnotations -}}
+{{- if not (hasKey $annotations "checksum/config") -}}
   {{- if eq (include "nvidia-device-plugin.hasEmbeddedConfigMap" .root) "true" -}}
-    {{- $_ := set $annotations "rollme" (include (print $.root.Template.BasePath "/configmap.yml") .root | sha256sum) -}}
-  {{- else if eq (include "nvidia-device-plugin.hasConfigMap" .root) "true" -}}
-    {{- $_ := set $annotations "rollme" (randAlphaNum 5) -}}
+    {{- $_ := set $annotations "checksum/config" (include (print $.root.Template.BasePath "/configmap.yml") .root | sha256sum) -}}
   {{- end -}}
 {{- end -}}
 {{- toYaml $annotations }}