feat: support annotations on Deployment/StatefulSet in Helm chart

deploy/helm/Chart.yaml

@@ -11,7 +11,7 @@ sources:
   - https://github.com/appsmithorg/appsmith
 home: https://www.appsmith.com/
 icon: https://assets.appsmith.com/appsmith-icon.png
-version: 3.6.8
+version: 3.6.9
 dependencies:
   - condition: redis.enabled
     name: redis

deploy/helm/templates/deployment.yaml

@@ -11,6 +11,15 @@ metadata:
   namespace: {{ include "appsmith.namespace" . }}
   labels:
     {{- include "appsmith.labels" . | nindent 4 }}
+  {{- if or .Values.annotations .Values.commonAnnotations }}
+  annotations:
+    {{- if .Values.annotations }}
+    {{- include "tplvalues.render" (dict "value" .Values.annotations "context" $) | nindent 4 }}
+    {{- end }}
+    {{- if .Values.commonAnnotations }}
+    {{- include "tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
+    {{- end }}
+  {{- end }}
 spec:
   {{- if $useDeployment }}
   {{- if not .Values.autoscaling.enabled }}

deploy/helm/tests/__snapshot__/defaults_snapshot_test.yaml.snap

@@ -25,7 +25,7 @@
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: appsmith
-        appsmith.sh/chart: appsmith-3.6.8
+        appsmith.sh/chart: appsmith-3.6.9
       name: RELEASE-NAME-appsmith
       namespace: NAMESPACE
   3: |
@@ -36,7 +36,7 @@
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: appsmith
-        appsmith.sh/chart: appsmith-3.6.8
+        appsmith.sh/chart: appsmith-3.6.9
       name: RELEASE-NAME-appsmith
       namespace: NAMESPACE
     spec:
@@ -142,7 +142,7 @@
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: appsmith
-        appsmith.sh/chart: appsmith-3.6.8
+        appsmith.sh/chart: appsmith-3.6.9
       name: RELEASE-NAME-appsmith-headless
       namespace: NAMESPACE
     spec:
@@ -181,7 +181,7 @@
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: appsmith
-        appsmith.sh/chart: appsmith-3.6.8
+        appsmith.sh/chart: appsmith-3.6.9
       name: RELEASE-NAME-appsmith
       namespace: NAMESPACE
     spec:
@@ -202,7 +202,7 @@
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: appsmith
-        appsmith.sh/chart: appsmith-3.6.8
+        appsmith.sh/chart: appsmith-3.6.9
       name: RELEASE-NAME-appsmith
       namespace: NAMESPACE
     secrets:

deploy/helm/tests/annotations_test.yaml

@@ -0,0 +1,70 @@
+templates:
+  - deployment.yaml
+tests:
+  - name: no annotations on StatefulSet when none are set
+    asserts:
+      - isNull:
+          path: metadata.annotations
+
+  - name: annotations should be set on StatefulSet
+    set:
+      annotations:
+        reloader.stakater.com/auto: "true"
+    asserts:
+      - equal:
+          path: kind
+          value: StatefulSet
+      - isSubset:
+          path: metadata.annotations
+          content:
+            reloader.stakater.com/auto: "true"
+
+  - name: annotations should be set on Deployment
+    set:
+      workload:
+        kind: Deployment
+      annotations:
+        reloader.stakater.com/auto: "true"
+    asserts:
+      - equal:
+          path: kind
+          value: Deployment
+      - isSubset:
+          path: metadata.annotations
+          content:
+            reloader.stakater.com/auto: "true"
+
+  - name: commonAnnotations should be set on StatefulSet
+    set:
+      commonAnnotations:
+        example.com/team: platform
+    asserts:
+      - isSubset:
+          path: metadata.annotations
+          content:
+            example.com/team: platform
+
+  - name: annotations and commonAnnotations should merge
+    set:
+      annotations:
+        reloader.stakater.com/auto: "true"
+      commonAnnotations:
+        example.com/team: platform
+    asserts:
+      - isSubset:
+          path: metadata.annotations
+          content:
+            reloader.stakater.com/auto: "true"
+            example.com/team: platform
+
+  - name: multiple annotations should all be set
+    set:
+      annotations:
+        reloader.stakater.com/auto: "true"
+        app.kubernetes.io/managed-by: helm
+    asserts:
+      - isSubset:
+          path: metadata.annotations
+          content:
+            reloader.stakater.com/auto: "true"
+            app.kubernetes.io/managed-by: helm

deploy/helm/values.yaml

@@ -146,6 +146,10 @@ serviceAccount:
   ##
   annotations: {}
 
+## @param annotations Annotations to add to the Deployment/StatefulSet resource
+##
+annotations: {}
+
 podAnnotations: {}
 
 podLabels: {}