Skip to content

Commit

Permalink
Merge b7f84f9 into 4a5fec5
Browse files Browse the repository at this point in the history
  • Loading branch information
frankh authored Oct 20, 2023
2 parents 4a5fec5 + b7f84f9 commit 129260b
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 15 deletions.
6 changes: 3 additions & 3 deletions charts/posthog/ALL_VALUES.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The following table lists the configurable parameters of the PostHog chart and t
| image.repository | string | `"posthog/posthog"` | PostHog image repository to use. |
| image.sha | string | `nil` | PostHog image SHA to use (example: `sha256:20af35fca6756d689d6705911a49dd6f2f6631e001ad43377b605cfc7c133eb4`). |
| image.tag | string | `nil` | PostHog image tag to use (example: `release-1.43.0`). |
| image.default | string | `":release-1.43.0"` | PostHog default image. Do not overwrite, use `image.sha` or `image.tag` instead. |
| image.default | string | `":latest"` | PostHog default image. Do not overwrite, use `image.sha` or `image.tag` instead. |
| image.pullPolicy | string | `"IfNotPresent"` | PostHog image pull policy. |
| image.pullSecrets | list | `[]` | |
| sentryDSN | string | `nil` | Sentry endpoint to send errors to. |
Expand Down Expand Up @@ -642,7 +642,7 @@ The following table lists the configurable parameters of the PostHog chart and t
| clickhouse.secure | bool | `false` | Whether to use TLS connection connecting to ClickHouse |
| clickhouse.verify | bool | `false` | Whether to verify TLS certificate on connection to ClickHouse |
| clickhouse.image.repository | string | `"clickhouse/clickhouse-server"` | ClickHouse image repository. |
| clickhouse.image.tag | string | `"22.8.11.15"` | ClickHouse image tag. Note: PostHog does not support all versions of ClickHouse. Please override the default only if you know what you are doing. |
| clickhouse.image.tag | string | `"23.9.2.56"` | ClickHouse image tag. Note: PostHog does not support all versions of ClickHouse. Please override the default only if you know what you are doing. |
| clickhouse.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| clickhouse.image.pullSecrets | list | `[]` | |
| clickhouse.tolerations | list | `[]` | Toleration labels for clickhouse pod assignment |
Expand Down Expand Up @@ -670,7 +670,7 @@ The following table lists the configurable parameters of the PostHog chart and t
| clickhouse.podAnnotations | string | `nil` | |
| clickhouse.podDistribution | string | `nil` | |
| clickhouse.client.image.repository | string | `"clickhouse/clickhouse-server"` | ClickHouse image repository. |
| clickhouse.client.image.tag | string | `"22.8.11.15"` | ClickHouse image tag. Note: PostHog does not support all versions of ClickHouse. Please override the default only if you know what you are doing. |
| clickhouse.client.image.tag | string | `"23.9.2.56"` | ClickHouse image tag. Note: PostHog does not support all versions of ClickHouse. Please override the default only if you know what you are doing. |
| clickhouse.client.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| clickhouse.client.image.pullSecrets | list | `[]` | |
| clickhouse.backup.enabled | bool | `false` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ should match the snapshot when backup is true:
value: backup
- name: BACKUP_PASSWORD
value: backup_password
image: clickhouse/clickhouse-server:22.8.11.15
image: clickhouse/clickhouse-server:23.9.2.56
imagePullPolicy: IfNotPresent
name: run-backup-cron
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ the manifest should match the snapshot when using default values:
- /bin/bash
- -c
- /usr/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml
image: clickhouse/clickhouse-server:22.8.11.15
image: clickhouse/clickhouse-server:23.9.2.56
name: clickhouse
ports:
- containerPort: 8123
Expand Down
2 changes: 1 addition & 1 deletion charts/posthog/tests/clickhouse-instance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ tests:
count: 1
- equal:
path: spec.templates.podTemplates[0].spec.containers[0].image
value: "clickhouse/clickhouse-server:22.8.11.15"
value: "clickhouse/clickhouse-server:23.9.2.56"

- it: allows modifying clickhouse-server version
set:
Expand Down
8 changes: 4 additions & 4 deletions charts/posthog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ image:
# -- PostHog image tag to use (example: `release-1.43.0`).
tag:
# -- PostHog default image. Do not overwrite, use `image.sha` or `image.tag` instead.
default: ":release-1.43.0"
default: ":latest"
# -- PostHog image pull policy.
pullPolicy: IfNotPresent
pullPolicy: Always
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
Expand Down Expand Up @@ -1796,7 +1796,7 @@ clickhouse:
# -- ClickHouse image repository.
repository: clickhouse/clickhouse-server
# -- ClickHouse image tag. Note: PostHog does not support all versions of ClickHouse. Please override the default only if you know what you are doing.
tag: "22.8.11.15"
tag: "23.9.2.56"
# -- Image pull policy
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
Expand Down Expand Up @@ -1921,7 +1921,7 @@ clickhouse:
# -- ClickHouse image repository.
repository: clickhouse/clickhouse-server
# -- ClickHouse image tag. Note: PostHog does not support all versions of ClickHouse. Please override the default only if you know what you are doing.
tag: "22.8.11.15"
tag: "23.9.2.56"
# -- Image pull policy
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
Expand Down
6 changes: 6 additions & 0 deletions ci/kubetest/helpers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ def wait_for_pods_to_be_ready(kube, labels=None, expected_count=None, namespace=
job_pods = [pod for pod in pods.values() if "job-name" in pod.obj.metadata.labels]

for job_pod in job_pods:
print("job logs")
try:
print([c.get_logs() for c in job_pod.get_containers()])
except Exception:
pass
print("job logs2")
assert job_pod.status().phase != "Failed", f"Detected failed job {job_pod.obj.metadata.name}"

if len(pods) > 0 and all(is_pod_ready(pod) for pod in non_job_pods):
Expand Down
6 changes: 3 additions & 3 deletions ci/kubetest/test_clickhouse_different_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from helpers.clickhouse import get_clickhouse_pod_spec
from helpers.utils import install_chart, is_posthog_healthy, wait_for_pods_to_be_ready

# Setting a value for the tag here to 22.8.11.15-alpine
# Setting a value for the tag here to 23.9.2.56-alpine
# This version because it will be compatible going forward after we
# require 22.3 for JSON Object datatype support
# This tests to make sure that when specified clickhouse-operator
Expand All @@ -14,7 +14,7 @@
clickhouse:
image:
tag: 22.8.11.15-alpine
tag: 23.9.2.56-alpine
"""


Expand All @@ -24,4 +24,4 @@ def test_clickhouse_pod_image(kube):

is_posthog_healthy(kube)
pod_spec = get_clickhouse_pod_spec(kube)
assert pod_spec.containers[0].image == "clickhouse/clickhouse-server:22.8.11.15-alpine"
assert pod_spec.containers[0].image == "clickhouse/clickhouse-server:23.9.2.56-alpine"
4 changes: 2 additions & 2 deletions ci/kubetest/test_clickhouse_external_password.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"""
clickhouse:
enabled: true
cluster: name-with-dash
cluster: namewithoutdash
database: kubetest_db
user: kubeuser
password: kubetestpw
Expand Down Expand Up @@ -44,7 +44,7 @@
externalClickhouse:
host: "clickhouse-posthog.clickhouse.svc.cluster.local"
cluster: name-with-dash
cluster: namewithoutdash
database: kubetest_db
user: kubeuser
password: kubetestpw
Expand Down

0 comments on commit 129260b

Please sign in to comment.