Merge c02c8dc into f95ceea

Author: frankh

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.35.0
+version: 30.36.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/_helpers.tpl

@@ -49,6 +49,19 @@ Set the posthog image
 {{- end -}}
 {{- end -}}
 
+{{/*
+Set the posthog web image
+*/}}
+{{- define "posthog.web.image.fullPath" -}}
+{{ if .Values.web.image.sha -}}
+"{{ .Values.web.image.repository }}@{{ .Values.web.image.sha }}"
+{{- else if .Values.web.image.tag -}}
+"{{ .Values.web.image.repository }}:{{ .Values.web.image.tag }}"
+{{- else -}}
+{{ include "posthog.image.fullPath" . }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Set zookeeper host
 */}}

charts/posthog/templates/web-deployment.yaml

@@ -81,9 +81,14 @@ spec:
 
       containers:
       - name: {{ .Chart.Name }}-web
-        image: {{ template "posthog.image.fullPath" . }}
+        image: {{ template "posthog.web.image.fullPath" . }}
+        {{ if .Values.web.image.command -}}
+        command:
+        {{- toYaml .Values.web.image.command | indent 8 }}
+        {{ else }}
         command:
           - ./bin/docker-server
+        {{ end }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - containerPort: {{ .Values.service.internalPort }}

charts/posthog/tests/web-deployment.yaml

@@ -167,3 +167,29 @@ tests:
           content:
             name: POSTHOG_POSTGRES_READ_HOST
             value: beep-boop
+
+  - it: should be able to have web.image set
+    template: templates/web-deployment.yaml
+    set:
+      cloud: local
+      web.image.sha: sha256:2a16a47578d0193480dd02bcda7952f09acb34eacdf764315123f2271f72838d
+      web.image.repository: webimage
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: webimage@sha256:2a16a47578d0193480dd02bcda7952f09acb34eacdf764315123f2271f72838d
+
+  - it: should be able to have custom web.image.command set
+    template: templates/web-deployment.yaml
+    set:
+      cloud: local
+      web.image.command: [./bin/run]
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: spec.template.spec.containers[0].command
+          value:
+          - ./bin/run

charts/posthog/values.yaml

@@ -189,6 +189,8 @@ web:
   # -- Whether to install the PostHog web stack or not.
   enabled: true
 
+  image: {}
+
   podAnnotations:
     # Uncomment these lines if you want Prometheus server to scrape metrics.
     # prometheus.io/scrape: "true"