Allow setting envvars in the events deployment (#648)

Author: xvello

charts/posthog/Chart.yaml

@@ -11,7 +11,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 30.1.0
+version: 30.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

charts/posthog/templates/events-deployment.yaml

@@ -113,7 +113,9 @@ spec:
 {{- if .Values.env }}
 {{ toYaml .Values.env | indent 8 }}
 {{- end }}
-{{- if .Values.web.env }}
+{{- if .Values.events.env }}
+{{ toYaml .Values.events.env | indent 8 }}
+{{- else if .Values.web.env }}
 {{ toYaml .Values.web.env | indent 8 }}
 {{- end }}
 

charts/posthog/tests/events-deployment.yaml

@@ -183,6 +183,61 @@ tests:
             name: SENTRY_DSN
             value: sentry.endpoint
 
+  - it: uses web.env if events.env is empty
+    template: templates/events-deployment.yaml # TODO: remove once secrets.yaml will be fixed/removed
+    set:
+      cloud: local # TODO: remove once secrets.yaml will be fixed/removed
+      env:
+        - name: FIRST
+          value: one
+      web:
+        env:
+          - name: SECOND
+            value: two
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: FIRST
+            value: one
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SECOND
+            value: two
+
+  - it: ignores web.env if events.env is set
+    template: templates/events-deployment.yaml # TODO: remove once secrets.yaml will be fixed/removed
+    set:
+      cloud: local # TODO: remove once secrets.yaml will be fixed/removed
+      env:
+        - name: FIRST
+          value: one
+      web:
+        env:
+          - name: SECOND
+            value: two
+      events:
+        env:
+          - name: THIRD
+            value: three
+    asserts:
+    - contains:
+        path: spec.template.spec.containers[0].env
+        content:
+          name: FIRST
+          value: one
+    - contains:
+        path: spec.template.spec.containers[0].env
+        content:
+          name: THIRD
+          value: three
+    - notContains:
+        path: spec.template.spec.containers[0].env
+        content:
+          name: SECOND
+          value: two
+
   - it: allows setting imagePullSecrets
     template: templates/events-deployment.yaml # TODO: remove once secrets.yaml will be fixed/removed
     set:

charts/posthog/values.yaml

@@ -74,6 +74,9 @@ events:
     # for configuration options
     behavior:
 
+  # -- Additional env variables to inject into the events stack, uses `web.env` if empty.
+  env: []
+
   # -- Container security context for the events stack HorizontalPodAutoscaler.
   securityContext:
     enabled: false