Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/candidate-9.4.x'
Browse files Browse the repository at this point in the history
Signed-off-by: Gavin Halliday <[email protected]>
  • Loading branch information
ghalliday committed Nov 2, 2023
2 parents c7a31de + 4156e96 commit f86e540
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion helm/hpcc/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2739,7 +2739,7 @@ A template to generate component annotations, merges static default annotations
Pass in dict with .root, .me
*/}}
{{- define "hpcc.generateAnnotations" -}}
{{- $annotations := dict -}}
{{- $annotations := dict "cluster-autoscaler.kubernetes.io/safe-to-evict" false -}}
{{- if hasKey .root.Values.global "componentAnnotations" -}}{{- $annotations = merge $annotations .root.Values.global.componentAnnotations -}}{{- end -}}
{{- if hasKey .me "annotations" -}}{{- $annotations = merge $annotations .me.annotations -}}{{- end -}}
{{- range $key, $value := $annotations }}
Expand Down

0 comments on commit f86e540

Please sign in to comment.