diff --git a/charts/nautobot/templates/celery-deployment.yaml b/charts/nautobot/templates/celery-deployment.yaml index ac3bf108..582e8312 100644 --- a/charts/nautobot/templates/celery-deployment.yaml +++ b/charts/nautobot/templates/celery-deployment.yaml @@ -14,9 +14,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" $.Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if (or $celery.annotations $.Values.commonAnnotations) }} - annotations: {{- include "common.tplvalues.render" ( dict "value" (merge $celery.annotations $.Values.commonAnnotations $config_checksum) "context" $ ) | nindent 4 }} - {{- else }} - annotations: {{- include "common.tplvalues.render" ( dict "value" $config_checksum "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" (merge $celery.annotations $.Values.commonAnnotations) "context" $ ) | nindent 4 }} {{- end }} spec: {{- if not $celery.autoscaling.enabled }} @@ -32,7 +30,9 @@ spec: template: metadata: {{- if $celery.podAnnotations }} - annotations: {{- include "common.tplvalues.render" (dict "value" $celery.podAnnotations "context" $) | nindent 8 }} + annotations: {{- include "common.tplvalues.render" (dict "value" (merge $celery.podAnnotations $config_checksum) "context" $) | nindent 8 }} + {{- else }} + annotations: {{- include "common.tplvalues.render" ( dict "value" $config_checksum "context" $ ) | nindent 8 }} {{- end }} labels: {{- include "common.labels.standard" $ | nindent 8 }} app.kubernetes.io/component: nautobot-celery-{{ $celeryName }} diff --git a/charts/nautobot/templates/nautobot-deployment.yaml b/charts/nautobot/templates/nautobot-deployment.yaml index 55c641b3..6196cb68 100644 --- a/charts/nautobot/templates/nautobot-deployment.yaml +++ b/charts/nautobot/templates/nautobot-deployment.yaml @@ -14,9 +14,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" $.Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if (or $nautobot.annotations $.Values.commonAnnotations) }} - annotations: {{- include "common.tplvalues.render" ( dict "value" (merge $nautobot.annotations $.Values.commonAnnotations $config_checksum) "context" $ ) | nindent 4 }} - {{- else }} - annotations: {{- include "common.tplvalues.render" ( dict "value" $config_checksum "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" (merge $nautobot.annotations $.Values.commonAnnotations) "context" $ ) | nindent 4 }} {{- end }} spec: {{- if not $nautobot.autoscaling.enabled }} @@ -32,7 +30,9 @@ spec: template: metadata: {{- if $nautobot.podAnnotations }} - annotations: {{- include "common.tplvalues.render" (dict "value" $nautobot.podAnnotations "context" $) | nindent 8 }} + annotations: {{- include "common.tplvalues.render" (dict "value" (merge $nautobot.podAnnotations $config_checksum) "context" $) | nindent 8 }} + {{- else }} + annotations: {{- include "common.tplvalues.render" ( dict "value" $config_checksum "context" $ ) | nindent 8 }} {{- end }} labels: {{- include "common.labels.standard" $ | nindent 8 }} app.kubernetes.io/component: nautobot-{{ $nautobotName }}