Merge c81db14 into 4a5fec5

PostHog · Oct 19, 2023 · a9853cb · a9853cb
2 parents 4a5fec5 + c81db14
commit a9853cb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/test-kubetest.yaml b/.github/workflows/test-kubetest.yaml
@@ -64,7 +64,8 @@ jobs:
           export PYTHONUNBUFFERED=1
           python -m pytest ${{ matrix.test-file }} \
             -s \
-            --maxfail=1
+            --maxfail=1 \
+            --kube-log-level=info
 
       - name: Emit namespace report
         uses: jupyterhub/action-k8s-namespace-report@v1

diff --git a/charts/posthog/Chart.yaml b/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.31.0
+version: 30.32.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.

diff --git a/charts/posthog/templates/events-deployment.yaml b/charts/posthog/templates/events-deployment.yaml
@@ -105,6 +105,8 @@ spec:
           value: '1'
         - name: IS_BEHIND_PROXY
           value: '1'
+        - name: DEBUG
+          value: 'true'
       {{- if eq .Values.web.secureCookies false }}
         - name: SECURE_COOKIES
           value: '0'
@@ -174,5 +176,4 @@ spec:
         {{- end }}
       initContainers:
       {{- include "_snippet-initContainers-wait-for-service-dependencies" . | indent 8 }}
-      {{- include "_snippet-initContainers-wait-for-migrations" . | indent 8 }}
 {{- end }}
diff --git a/charts/posthog/templates/recordings-deployment.yaml b/charts/posthog/templates/recordings-deployment.yaml
@@ -174,5 +174,4 @@ spec:
         {{- end }}
       initContainers:
       {{- include "_snippet-initContainers-wait-for-service-dependencies" . | indent 8 }}
-      {{- include "_snippet-initContainers-wait-for-migrations" . | indent 8 }}
 {{- end }}
diff --git a/charts/posthog/tests/_initContainers-wait-for-migrations.yaml b/charts/posthog/tests/_initContainers-wait-for-migrations.yaml
@@ -1,6 +1,5 @@
 suite: _initContainers-wait-for-migrations
 templates:
-  - templates/events-deployment.yaml
   - templates/plugins-deployment.yaml
   - templates/web-deployment.yaml
   - templates/worker-deployment.yaml
@@ -10,7 +9,6 @@ templates:
 tests:
   - it: spec.template.spec.initContainers[1].env override via 'env' should work
     templates: # TODO: remove once secrets.yaml will be fixed/removed
-      - templates/events-deployment.yaml
       - templates/plugins-deployment.yaml
       - templates/web-deployment.yaml
       - templates/worker-deployment.yaml

diff --git a/ci/kubetest/helpers/utils.py b/ci/kubetest/helpers/utils.py
@@ -110,6 +110,12 @@ def wait_for_pods_to_be_ready(kube, labels=None, expected_count=None, namespace=
                 # NOTE 2: the test is currently a bit flaky likely due to
                 # liveness/readiness checks. I'm bumping the expected restart
                 # count from 0 to 2 for now.
+                print("container logs start")
+                try:
+                    print([c.get_logs() for c in pod.get_containers()])
+                except Exception:
+                    pass
+                print("container logs finish")
                 assert get_pod_restart_count(pod) < 2, f"Detected too many restarts in pod {pod.obj.metadata.name}"
 
         # Note we assume that if "job-name" is a label then it is a job pod.