From 4b8b02f235d46a670ea7a407ae06f4a836203763 Mon Sep 17 00:00:00 2001 From: Guido Iaquinti Date: Wed, 6 Jul 2022 11:34:11 +0200 Subject: [PATCH 1/4] clickhouse-operator: upgrade to 0.18.5 --- ...seinstallations.clickhouse.altinity.com.yaml | 2 +- ...lationtemplates.clickhouse.altinity.com.yaml | 2 +- ...rconfigurations.clickhouse.altinity.com.yaml | 2 +- .../clickhouse-operator/clusterrole.yaml | 2 +- .../clickhouse-operator/clusterrolebinding.yaml | 2 +- .../clickhouse-operator/configmap.yaml | 10 +++++----- .../clickhouse-operator/deployment.yaml | 10 +++++----- .../templates/clickhouse-operator/service.yaml | 2 +- .../clickhouse-operator/serviceaccount.yaml | 2 +- scripts/clickhouse_operator_sync.sh | 17 ++++++----------- 10 files changed, 23 insertions(+), 28 deletions(-) diff --git a/charts/posthog/crds/clickhouseinstallations.clickhouse.altinity.com.yaml b/charts/posthog/crds/clickhouseinstallations.clickhouse.altinity.com.yaml index 6c65c2241..a2a64ddec 100644 --- a/charts/posthog/crds/clickhouseinstallations.clickhouse.altinity.com.yaml +++ b/charts/posthog/crds/clickhouseinstallations.clickhouse.altinity.com.yaml @@ -10,7 +10,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseinstallations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 spec: group: clickhouse.altinity.com scope: Namespaced diff --git a/charts/posthog/crds/clickhouseinstallationtemplates.clickhouse.altinity.com.yaml b/charts/posthog/crds/clickhouseinstallationtemplates.clickhouse.altinity.com.yaml index fd8a53296..20a320ff0 100644 --- a/charts/posthog/crds/clickhouseinstallationtemplates.clickhouse.altinity.com.yaml +++ b/charts/posthog/crds/clickhouseinstallationtemplates.clickhouse.altinity.com.yaml @@ -10,7 +10,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseinstallationtemplates.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 spec: group: clickhouse.altinity.com scope: Namespaced diff --git a/charts/posthog/crds/clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml b/charts/posthog/crds/clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml index bf1520c94..7cf3acf3e 100644 --- a/charts/posthog/crds/clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml +++ b/charts/posthog/crds/clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml @@ -7,7 +7,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseoperatorconfigurations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 spec: group: clickhouse.altinity.com scope: Namespaced diff --git a/charts/posthog/templates/clickhouse-operator/clusterrole.yaml b/charts/posthog/templates/clickhouse-operator/clusterrole.yaml index e59a9eeb7..3eaa6e1a8 100644 --- a/charts/posthog/templates/clickhouse-operator/clusterrole.yaml +++ b/charts/posthog/templates/clickhouse-operator/clusterrole.yaml @@ -14,7 +14,7 @@ metadata: name: clickhouse-operator-{{ .Values.clickhouse.namespace | default .Release.Namespace }} namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 rules: - apiGroups: - "" diff --git a/charts/posthog/templates/clickhouse-operator/clusterrolebinding.yaml b/charts/posthog/templates/clickhouse-operator/clusterrolebinding.yaml index b8586d209..fa612c047 100644 --- a/charts/posthog/templates/clickhouse-operator/clusterrolebinding.yaml +++ b/charts/posthog/templates/clickhouse-operator/clusterrolebinding.yaml @@ -7,7 +7,7 @@ metadata: name: clickhouse-operator-{{ .Values.clickhouse.namespace | default .Release.Namespace }} namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/posthog/templates/clickhouse-operator/configmap.yaml b/charts/posthog/templates/clickhouse-operator/configmap.yaml index 793564b1d..10f868647 100644 --- a/charts/posthog/templates/clickhouse-operator/configmap.yaml +++ b/charts/posthog/templates/clickhouse-operator/configmap.yaml @@ -11,7 +11,7 @@ metadata: name: etc-clickhouse-operator-files namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 app: clickhouse-operator data: config.yaml: | @@ -243,7 +243,7 @@ metadata: name: etc-clickhouse-operator-confd-files namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 app: clickhouse-operator data: @@ -261,7 +261,7 @@ metadata: name: etc-clickhouse-operator-configd-files namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 app: clickhouse-operator data: 01-clickhouse-01-listen.xml: | @@ -321,7 +321,7 @@ metadata: name: etc-clickhouse-operator-templatesd-files namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 app: clickhouse-operator data: 001-templates.json.example: | @@ -423,7 +423,7 @@ metadata: name: etc-clickhouse-operator-usersd-files namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 app: clickhouse-operator data: 01-clickhouse-user.xml: | diff --git a/charts/posthog/templates/clickhouse-operator/deployment.yaml b/charts/posthog/templates/clickhouse-operator/deployment.yaml index 930c1ae88..ee5231fb6 100644 --- a/charts/posthog/templates/clickhouse-operator/deployment.yaml +++ b/charts/posthog/templates/clickhouse-operator/deployment.yaml @@ -3,8 +3,8 @@ # # NAMESPACE={{ .Values.clickhouse.namespace | default .Release.Namespace }} # COMMENT= -# OPERATOR_IMAGE=altinity/clickhouse-operator:0.19.0 -# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:latest +# OPERATOR_IMAGE=altinity/clickhouse-operator:0.18.5 +# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.18.5 # # Setup Deployment for clickhouse-operator # Deployment would be created in kubectl-specified namespace @@ -14,7 +14,7 @@ metadata: name: clickhouse-operator namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 app: clickhouse-operator spec: replicas: 1 @@ -48,7 +48,7 @@ spec: name: etc-clickhouse-operator-usersd-files containers: - name: clickhouse-operator - image: altinity/clickhouse-operator:0.19.0 + image: altinity/clickhouse-operator:0.18.5 imagePullPolicy: Always volumeMounts: - name: etc-clickhouse-operator-folder @@ -113,7 +113,7 @@ spec: resource: limits.memory - name: metrics-exporter - image: altinity/metrics-exporter:latest + image: altinity/metrics-exporter:0.18.5 imagePullPolicy: Always volumeMounts: - name: etc-clickhouse-operator-folder diff --git a/charts/posthog/templates/clickhouse-operator/service.yaml b/charts/posthog/templates/clickhouse-operator/service.yaml index 951dff2a5..854985b4a 100644 --- a/charts/posthog/templates/clickhouse-operator/service.yaml +++ b/charts/posthog/templates/clickhouse-operator/service.yaml @@ -15,7 +15,7 @@ metadata: name: clickhouse-operator-metrics namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 app: clickhouse-operator spec: ports: diff --git a/charts/posthog/templates/clickhouse-operator/serviceaccount.yaml b/charts/posthog/templates/clickhouse-operator/serviceaccount.yaml index 35a470bb1..45c94ecfc 100644 --- a/charts/posthog/templates/clickhouse-operator/serviceaccount.yaml +++ b/charts/posthog/templates/clickhouse-operator/serviceaccount.yaml @@ -12,6 +12,6 @@ metadata: name: clickhouse-operator namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 {{- end }} diff --git a/scripts/clickhouse_operator_sync.sh b/scripts/clickhouse_operator_sync.sh index af7bca220..e135bfb4e 100755 --- a/scripts/clickhouse_operator_sync.sh +++ b/scripts/clickhouse_operator_sync.sh @@ -17,7 +17,12 @@ CHART_PATH=$(cd "$CHART_PATH_RAW" 2> /dev/null && pwd -P) TMP_FOLDER="$(mktemp -d)" trap 'rm -rf -- "$TMP_FOLDER"' EXIT -CLICKHOUSE_OPERATOR_TAG="0.18.4" +CLICKHOUSE_OPERATOR_TAG="0.18.5" +OPERATOR_IMAGE="${OPERATOR_IMAGE:-altinity/clickhouse-operator:$CLICKHOUSE_OPERATOR_TAG}" +METRICS_EXPORTER_IMAGE="${METRICS_EXPORTER_IMAGE:-altinity/metrics-exporter:$CLICKHOUSE_OPERATOR_TAG}" + +OPERATOR_NAMESPACE="PLACEHOLDER" +METRICS_EXPORTER_NAMESPACE="${OPERATOR_NAMESPACE}" URL="https://raw.githubusercontent.com/Altinity/clickhouse-operator/${CLICKHOUSE_OPERATOR_TAG}/deploy/operator/clickhouse-operator-install-template.yaml" # @@ -25,16 +30,6 @@ URL="https://raw.githubusercontent.com/Altinity/clickhouse-operator/${CLICKHOUSE # # see: https://github.com/Altinity/clickhouse-operator/blob/master/docs/quick_start.md#in-case-you-can-not-run-scripts-from-internet-in-your-protected-environment # -OPERATOR_NAMESPACE="PLACEHOLDER" -METRICS_EXPORTER_NAMESPACE="${OPERATOR_NAMESPACE}" -# NOTE: we pin to 0.19.0 here which is different to the 0.16.1 manifest version. -# Prior to pinning we were specifying latest, so to ensure that the version -# doesn't change on existing installs we pin to latest as of writing, thereby -# mitigating the possibility that chart will unexpectedly update, while also -# maintaining current functionality. -OPERATOR_IMAGE="${OPERATOR_IMAGE:-altinity/clickhouse-operator:0.19.0}" -METRICS_EXPORTER_IMAGE="${METRICS_EXPORTER_IMAGE:-altinity/metrics-exporter:latest}" - curl -s "${URL}" | \ OPERATOR_IMAGE="${OPERATOR_IMAGE}" \ OPERATOR_NAMESPACE="${OPERATOR_NAMESPACE}" \ From 57e7b5d4d4cff8b3837c369899eff44470f6d4cd Mon Sep 17 00:00:00 2001 From: Guido Iaquinti Date: Wed, 6 Jul 2022 11:42:42 +0200 Subject: [PATCH 2/4] Update tests --- .../__snapshot__/clusterrole.yaml.snap | 2 +- .../__snapshot__/clusterrolebinding.yaml.snap | 2 +- .../__snapshot__/configmap.yaml.snap | 10 +++++----- .../__snapshot__/deployment.yaml.snap | 6 +++--- .../clickhouse-operator/__snapshot__/service.yaml.snap | 2 +- .../__snapshot__/serviceaccount.yaml.snap | 2 +- .../posthog/tests/clickhouse-operator/deployment.yaml | 4 ++-- .../tests/clickhouse-operator/serviceaccount.yaml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrole.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrole.yaml.snap index 460cef6e0..a34b00070 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrole.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrole.yaml.snap @@ -4,7 +4,7 @@ the manifest should match the snapshot when using default values: kind: ClusterRole metadata: labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 name: clickhouse-operator-NAMESPACE namespace: NAMESPACE rules: diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrolebinding.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrolebinding.yaml.snap index 47377c592..ceb165cce 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrolebinding.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrolebinding.yaml.snap @@ -4,7 +4,7 @@ the manifest should match the snapshot when using default values: kind: ClusterRoleBinding metadata: labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 name: clickhouse-operator-NAMESPACE namespace: NAMESPACE roleRef: diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/configmap.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/configmap.yaml.snap index 2629296f7..aabe4c0a0 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/configmap.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/configmap.yaml.snap @@ -220,7 +220,7 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 name: etc-clickhouse-operator-files namespace: NAMESPACE 2: | @@ -230,7 +230,7 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 name: etc-clickhouse-operator-confd-files namespace: NAMESPACE 3: | @@ -279,7 +279,7 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 name: etc-clickhouse-operator-configd-files namespace: NAMESPACE 4: | @@ -371,7 +371,7 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 name: etc-clickhouse-operator-templatesd-files namespace: NAMESPACE 5: | @@ -423,6 +423,6 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 name: etc-clickhouse-operator-usersd-files namespace: NAMESPACE diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/deployment.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/deployment.yaml.snap index e0123d49c..dcb60ef1f 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/deployment.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/deployment.yaml.snap @@ -5,7 +5,7 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 name: clickhouse-operator namespace: NAMESPACE spec: @@ -63,7 +63,7 @@ the manifest should match the snapshot when using default values: resourceFieldRef: containerName: clickhouse-operator resource: limits.memory - image: altinity/clickhouse-operator:0.19.0 + image: altinity/clickhouse-operator:0.18.5 imagePullPolicy: Always name: clickhouse-operator volumeMounts: @@ -77,7 +77,7 @@ the manifest should match the snapshot when using default values: name: etc-clickhouse-operator-templatesd-folder - mountPath: /etc/clickhouse-operator/users.d name: etc-clickhouse-operator-usersd-folder - - image: altinity/metrics-exporter:latest + - image: altinity/metrics-exporter:0.18.5 imagePullPolicy: Always name: metrics-exporter ports: diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/service.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/service.yaml.snap index 8dfc15395..d593ca10a 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/service.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/service.yaml.snap @@ -5,7 +5,7 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 name: clickhouse-operator-metrics namespace: NAMESPACE spec: diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/serviceaccount.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/serviceaccount.yaml.snap index 1a2f4eb9f..503b4800c 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/serviceaccount.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/serviceaccount.yaml.snap @@ -4,6 +4,6 @@ the manifest should match the snapshot when using default values: kind: ServiceAccount metadata: labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 name: clickhouse-operator namespace: NAMESPACE diff --git a/charts/posthog/tests/clickhouse-operator/deployment.yaml b/charts/posthog/tests/clickhouse-operator/deployment.yaml index 9c597076e..7c6886250 100644 --- a/charts/posthog/tests/clickhouse-operator/deployment.yaml +++ b/charts/posthog/tests/clickhouse-operator/deployment.yaml @@ -29,7 +29,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: metadata.namespace override via Release.Namespace should work release: @@ -44,4 +44,4 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 diff --git a/charts/posthog/tests/clickhouse-operator/serviceaccount.yaml b/charts/posthog/tests/clickhouse-operator/serviceaccount.yaml index 622bbe52f..3da6b760f 100644 --- a/charts/posthog/tests/clickhouse-operator/serviceaccount.yaml +++ b/charts/posthog/tests/clickhouse-operator/serviceaccount.yaml @@ -28,7 +28,7 @@ tests: name: clickhouse-operator namespace: custom-namespace labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: metadata.namespace override via Release.Namespace should work release: @@ -42,4 +42,4 @@ tests: name: clickhouse-operator namespace: custom-namespace-from-release labels: - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 From 4dfa7976da3947bf49f64a43b4078db5c9e25653 Mon Sep 17 00:00:00 2001 From: Guido Iaquinti Date: Wed, 6 Jul 2022 11:44:24 +0200 Subject: [PATCH 3/4] Doh! --- .../tests/clickhouse-operator/configmap.yaml | 20 +++++++++---------- .../tests/clickhouse-operator/service.yaml | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/posthog/tests/clickhouse-operator/configmap.yaml b/charts/posthog/tests/clickhouse-operator/configmap.yaml index 81c96bea0..d275f7b13 100644 --- a/charts/posthog/tests/clickhouse-operator/configmap.yaml +++ b/charts/posthog/tests/clickhouse-operator/configmap.yaml @@ -30,7 +30,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: ConfigMap/etc-clickhouse-operator-files metadata.namespace override via Release.Namespace should work release: @@ -46,7 +46,7 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: ConfigMap/etc-clickhouse-operator-confd-files metadata.namespace override via clickhouse.namespace should work set: @@ -62,7 +62,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: ConfigMap/etc-clickhouse-operator-confd-files metadata.namespace override via Release.Namespace should work release: @@ -78,7 +78,7 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: ConfigMap/etc-clickhouse-operator-configd-files metadata.namespace override via clickhouse.namespace should work set: @@ -94,7 +94,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: ConfigMap/etc-clickhouse-operator-configd-files metadata.namespace override via Release.Namespace should work release: @@ -110,7 +110,7 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: ConfigMap/etc-clickhouse-operator-templatesd-files metadata.namespace override via clickhouse.namespace should work set: @@ -126,7 +126,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: ConfigMap/etc-clickhouse-operator-templatesd-files metadata.namespace override via Release.Namespace should work release: @@ -142,7 +142,7 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: ConfigMap/etc-clickhouse-operator-usersd-files metadata.namespace override via clickhouse.namespace should work set: @@ -158,7 +158,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: ConfigMap/etc-clickhouse-operator-usersd-files metadata.namespace override via Release.Namespace should work release: @@ -174,4 +174,4 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 diff --git a/charts/posthog/tests/clickhouse-operator/service.yaml b/charts/posthog/tests/clickhouse-operator/service.yaml index 0b6e330ad..235ecc272 100644 --- a/charts/posthog/tests/clickhouse-operator/service.yaml +++ b/charts/posthog/tests/clickhouse-operator/service.yaml @@ -29,7 +29,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 - it: metadata.namespace override via Release.Namespace should work release: @@ -44,4 +44,4 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.4 + clickhouse.altinity.com/chop: 0.18.5 From e372fca965143979bf079b740bf196b994c7f20a Mon Sep 17 00:00:00 2001 From: Guido Iaquinti Date: Tue, 2 Aug 2022 12:22:30 +0200 Subject: [PATCH 4/4] 0.19.0 --- ...installations.clickhouse.altinity.com.yaml | 30 ++++++++- ...tiontemplates.clickhouse.altinity.com.yaml | 30 ++++++++- ...onfigurations.clickhouse.altinity.com.yaml | 5 +- .../clickhouse-operator/clusterrole.yaml | 2 +- .../clusterrolebinding.yaml | 2 +- .../clickhouse-operator/configmap.yaml | 61 ++++++++++++++++--- .../clickhouse-operator/deployment.yaml | 16 ++--- .../clickhouse-operator/service.yaml | 2 +- .../clickhouse-operator/serviceaccount.yaml | 2 +- .../__snapshot__/clusterrole.yaml.snap | 2 +- .../__snapshot__/clusterrolebinding.yaml.snap | 2 +- .../__snapshot__/configmap.yaml.snap | 61 ++++++++++++++++--- .../__snapshot__/deployment.yaml.snap | 10 +-- .../__snapshot__/service.yaml.snap | 2 +- .../__snapshot__/serviceaccount.yaml.snap | 2 +- .../tests/clickhouse-operator/configmap.yaml | 20 +++--- .../tests/clickhouse-operator/deployment.yaml | 4 +- .../tests/clickhouse-operator/service.yaml | 4 +- .../clickhouse-operator/serviceaccount.yaml | 4 +- scripts/clickhouse_operator_sync.sh | 2 +- 20 files changed, 205 insertions(+), 58 deletions(-) diff --git a/charts/posthog/crds/clickhouseinstallations.clickhouse.altinity.com.yaml b/charts/posthog/crds/clickhouseinstallations.clickhouse.altinity.com.yaml index a2a64ddec..0ee130158 100644 --- a/charts/posthog/crds/clickhouseinstallations.clickhouse.altinity.com.yaml +++ b/charts/posthog/crds/clickhouseinstallations.clickhouse.altinity.com.yaml @@ -10,7 +10,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseinstallations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 spec: group: clickhouse.altinity.com scope: Namespaced @@ -119,6 +119,9 @@ spec: chop-date: type: string description: "ClickHouse operator build date" + chop-ip: + type: string + description: "IP address of the operator's pod which managed this CHI" clusters: type: integer minimum: 0 @@ -188,6 +191,11 @@ spec: description: "Pods" items: type: string + pod-ips: + type: array + description: "Pod IPs" + items: + type: string fqdns: type: array description: "Pods FQDNs" @@ -657,6 +665,26 @@ spec: volumeClaimTemplate: type: string description: "DEPRECATED! VolumeClaimTemplate is deprecated in favor of DataVolumeClaimTemplate and LogVolumeClaimTemplate" + schemaPolicy: + type: object + description: | + describes how schema is propagated within replicas and shards + properties: + replica: + type: string + description: "how schema is propagated within a replica" + enum: + # List SchemaPolicyReplicaXXX constants from model + - "None" + - "All" + shard: + type: string + description: "how schema is propagated between shards" + enum: + # List SchemaPolicyShardXXX constants from model + - "None" + - "All" + - "DistributedTablesOnly" layout: type: object description: | diff --git a/charts/posthog/crds/clickhouseinstallationtemplates.clickhouse.altinity.com.yaml b/charts/posthog/crds/clickhouseinstallationtemplates.clickhouse.altinity.com.yaml index 20a320ff0..2d29d3b13 100644 --- a/charts/posthog/crds/clickhouseinstallationtemplates.clickhouse.altinity.com.yaml +++ b/charts/posthog/crds/clickhouseinstallationtemplates.clickhouse.altinity.com.yaml @@ -10,7 +10,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseinstallationtemplates.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 spec: group: clickhouse.altinity.com scope: Namespaced @@ -119,6 +119,9 @@ spec: chop-date: type: string description: "ClickHouse operator build date" + chop-ip: + type: string + description: "IP address of the operator's pod which managed this CHI" clusters: type: integer minimum: 0 @@ -188,6 +191,11 @@ spec: description: "Pods" items: type: string + pod-ips: + type: array + description: "Pod IPs" + items: + type: string fqdns: type: array description: "Pods FQDNs" @@ -657,6 +665,26 @@ spec: volumeClaimTemplate: type: string description: "DEPRECATED! VolumeClaimTemplate is deprecated in favor of DataVolumeClaimTemplate and LogVolumeClaimTemplate" + schemaPolicy: + type: object + description: | + describes how schema is propagated within replicas and shards + properties: + replica: + type: string + description: "how schema is propagated within a replica" + enum: + # List SchemaPolicyReplicaXXX constants from model + - "None" + - "All" + shard: + type: string + description: "how schema is propagated between shards" + enum: + # List SchemaPolicyShardXXX constants from model + - "None" + - "All" + - "DistributedTablesOnly" layout: type: object description: | diff --git a/charts/posthog/crds/clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml b/charts/posthog/crds/clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml index 7cf3acf3e..81972550e 100644 --- a/charts/posthog/crds/clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml +++ b/charts/posthog/crds/clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml @@ -7,7 +7,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseoperatorconfigurations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 spec: group: clickhouse.altinity.com scope: Namespaced @@ -116,6 +116,9 @@ spec: password: type: string description: "ClickHouse password to be used by operator to connect to ClickHouse instances, deprecated, use chCredentialsSecretName" + rootCA: + type: string + description: "Root certificate authority that clients use when verifying server certificates. Used for https connection to ClickHouse" secret: type: object properties: diff --git a/charts/posthog/templates/clickhouse-operator/clusterrole.yaml b/charts/posthog/templates/clickhouse-operator/clusterrole.yaml index 3eaa6e1a8..50e8d1882 100644 --- a/charts/posthog/templates/clickhouse-operator/clusterrole.yaml +++ b/charts/posthog/templates/clickhouse-operator/clusterrole.yaml @@ -14,7 +14,7 @@ metadata: name: clickhouse-operator-{{ .Values.clickhouse.namespace | default .Release.Namespace }} namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 rules: - apiGroups: - "" diff --git a/charts/posthog/templates/clickhouse-operator/clusterrolebinding.yaml b/charts/posthog/templates/clickhouse-operator/clusterrolebinding.yaml index fa612c047..651e94508 100644 --- a/charts/posthog/templates/clickhouse-operator/clusterrolebinding.yaml +++ b/charts/posthog/templates/clickhouse-operator/clusterrolebinding.yaml @@ -7,7 +7,7 @@ metadata: name: clickhouse-operator-{{ .Values.clickhouse.namespace | default .Release.Namespace }} namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/posthog/templates/clickhouse-operator/configmap.yaml b/charts/posthog/templates/clickhouse-operator/configmap.yaml index 10f868647..8975516ea 100644 --- a/charts/posthog/templates/clickhouse-operator/configmap.yaml +++ b/charts/posthog/templates/clickhouse-operator/configmap.yaml @@ -11,13 +11,16 @@ metadata: name: etc-clickhouse-operator-files namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 app: clickhouse-operator data: config.yaml: | # IMPORTANT - # This file is auto-generated from deploy/builder/templates-config. - # It will be overwritten upon next sources build. + # This file is auto-generated + # Do not edit this file - all changes would be lost + # Edit appropriate template in the following folder: + # deploy/builder/templates-config + # IMPORTANT # # Template parameters available: # watchNamespaces @@ -243,7 +246,7 @@ metadata: name: etc-clickhouse-operator-confd-files namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 app: clickhouse-operator data: @@ -261,10 +264,16 @@ metadata: name: etc-clickhouse-operator-configd-files namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 app: clickhouse-operator data: 01-clickhouse-01-listen.xml: | + + + + + + :: @@ -273,6 +282,12 @@ data: 01-clickhouse-02-logger.xml: | + + + + + + @@ -287,6 +302,12 @@ data: 01-clickhouse-03-query_log.xml: | + + + + + + system @@ -298,6 +319,12 @@ data: 01-clickhouse-04-part_log.xml: | + + + + + + system @@ -321,7 +348,7 @@ metadata: name: etc-clickhouse-operator-templatesd-files namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 app: clickhouse-operator data: 001-templates.json.example: | @@ -423,17 +450,21 @@ metadata: name: etc-clickhouse-operator-usersd-files namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 app: clickhouse-operator data: 01-clickhouse-user.xml: | + + + + + + 127.0.0.1 - 0.0.0.0/0 - ::/0 716b36073a90c6fe1d445ac1af85f4777c5b7a155cea359961826a030513e448 clickhouse_operator @@ -450,6 +481,12 @@ data: 02-clickhouse-default-profile.xml: | + + + + + + @@ -461,6 +498,12 @@ data: 03-database-ordinary.xml: | + + + + + + diff --git a/charts/posthog/templates/clickhouse-operator/deployment.yaml b/charts/posthog/templates/clickhouse-operator/deployment.yaml index ee5231fb6..4dee23d1d 100644 --- a/charts/posthog/templates/clickhouse-operator/deployment.yaml +++ b/charts/posthog/templates/clickhouse-operator/deployment.yaml @@ -3,8 +3,10 @@ # # NAMESPACE={{ .Values.clickhouse.namespace | default .Release.Namespace }} # COMMENT= -# OPERATOR_IMAGE=altinity/clickhouse-operator:0.18.5 -# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.18.5 +# OPERATOR_IMAGE=altinity/clickhouse-operator:0.19.0 +# OPERATOR_IMAGE_PULL_POLICY= +# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.19.0 +# METRICS_EXPORTER_IMAGE_PULL_POLICY= # # Setup Deployment for clickhouse-operator # Deployment would be created in kubectl-specified namespace @@ -14,7 +16,7 @@ metadata: name: clickhouse-operator namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 app: clickhouse-operator spec: replicas: 1 @@ -48,8 +50,8 @@ spec: name: etc-clickhouse-operator-usersd-files containers: - name: clickhouse-operator - image: altinity/clickhouse-operator:0.18.5 - imagePullPolicy: Always + image: altinity/clickhouse-operator:0.19.0 + imagePullPolicy: volumeMounts: - name: etc-clickhouse-operator-folder mountPath: /etc/clickhouse-operator @@ -113,8 +115,8 @@ spec: resource: limits.memory - name: metrics-exporter - image: altinity/metrics-exporter:0.18.5 - imagePullPolicy: Always + image: altinity/metrics-exporter:0.19.0 + imagePullPolicy: volumeMounts: - name: etc-clickhouse-operator-folder mountPath: /etc/clickhouse-operator diff --git a/charts/posthog/templates/clickhouse-operator/service.yaml b/charts/posthog/templates/clickhouse-operator/service.yaml index 854985b4a..ba6573945 100644 --- a/charts/posthog/templates/clickhouse-operator/service.yaml +++ b/charts/posthog/templates/clickhouse-operator/service.yaml @@ -15,7 +15,7 @@ metadata: name: clickhouse-operator-metrics namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 app: clickhouse-operator spec: ports: diff --git a/charts/posthog/templates/clickhouse-operator/serviceaccount.yaml b/charts/posthog/templates/clickhouse-operator/serviceaccount.yaml index 45c94ecfc..4625f69f1 100644 --- a/charts/posthog/templates/clickhouse-operator/serviceaccount.yaml +++ b/charts/posthog/templates/clickhouse-operator/serviceaccount.yaml @@ -12,6 +12,6 @@ metadata: name: clickhouse-operator namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }} labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 {{- end }} diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrole.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrole.yaml.snap index a34b00070..b3d6ec94a 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrole.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrole.yaml.snap @@ -4,7 +4,7 @@ the manifest should match the snapshot when using default values: kind: ClusterRole metadata: labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 name: clickhouse-operator-NAMESPACE namespace: NAMESPACE rules: diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrolebinding.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrolebinding.yaml.snap index ceb165cce..09df69d13 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrolebinding.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/clusterrolebinding.yaml.snap @@ -4,7 +4,7 @@ the manifest should match the snapshot when using default values: kind: ClusterRoleBinding metadata: labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 name: clickhouse-operator-NAMESPACE namespace: NAMESPACE roleRef: diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/configmap.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/configmap.yaml.snap index aabe4c0a0..2381266ee 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/configmap.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/configmap.yaml.snap @@ -4,8 +4,11 @@ the manifest should match the snapshot when using default values: data: config.yaml: | # IMPORTANT - # This file is auto-generated from deploy/builder/templates-config. - # It will be overwritten upon next sources build. + # This file is auto-generated + # Do not edit this file - all changes would be lost + # Edit appropriate template in the following folder: + # deploy/builder/templates-config + # IMPORTANT # # Template parameters available: # watchNamespaces @@ -220,7 +223,7 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 name: etc-clickhouse-operator-files namespace: NAMESPACE 2: | @@ -230,13 +233,19 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 name: etc-clickhouse-operator-confd-files namespace: NAMESPACE 3: | apiVersion: v1 data: 01-clickhouse-01-listen.xml: | + + + + + + :: @@ -244,6 +253,12 @@ the manifest should match the snapshot when using default values: 1 01-clickhouse-02-logger.xml: | + + + + + + @@ -257,6 +272,12 @@ the manifest should match the snapshot when using default values: 01-clickhouse-03-query_log.xml: | + + + + + + system @@ -267,6 +288,12 @@ the manifest should match the snapshot when using default values: 01-clickhouse-04-part_log.xml: | + + + + + + system @@ -279,7 +306,7 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 name: etc-clickhouse-operator-configd-files namespace: NAMESPACE 4: | @@ -371,20 +398,24 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 name: etc-clickhouse-operator-templatesd-files namespace: NAMESPACE 5: | apiVersion: v1 data: 01-clickhouse-user.xml: | + + + + + + 127.0.0.1 - 0.0.0.0/0 - ::/0 716b36073a90c6fe1d445ac1af85f4777c5b7a155cea359961826a030513e448 clickhouse_operator @@ -400,6 +431,12 @@ the manifest should match the snapshot when using default values: 02-clickhouse-default-profile.xml: | + + + + + + @@ -411,6 +448,12 @@ the manifest should match the snapshot when using default values: 03-database-ordinary.xml: | + + + + + + @@ -423,6 +466,6 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 name: etc-clickhouse-operator-usersd-files namespace: NAMESPACE diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/deployment.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/deployment.yaml.snap index dcb60ef1f..064adb049 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/deployment.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/deployment.yaml.snap @@ -5,7 +5,7 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 name: clickhouse-operator namespace: NAMESPACE spec: @@ -63,8 +63,8 @@ the manifest should match the snapshot when using default values: resourceFieldRef: containerName: clickhouse-operator resource: limits.memory - image: altinity/clickhouse-operator:0.18.5 - imagePullPolicy: Always + image: altinity/clickhouse-operator:0.19.0 + imagePullPolicy: null name: clickhouse-operator volumeMounts: - mountPath: /etc/clickhouse-operator @@ -77,8 +77,8 @@ the manifest should match the snapshot when using default values: name: etc-clickhouse-operator-templatesd-folder - mountPath: /etc/clickhouse-operator/users.d name: etc-clickhouse-operator-usersd-folder - - image: altinity/metrics-exporter:0.18.5 - imagePullPolicy: Always + - image: altinity/metrics-exporter:0.19.0 + imagePullPolicy: null name: metrics-exporter ports: - containerPort: 8888 diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/service.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/service.yaml.snap index d593ca10a..e6bd3ec21 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/service.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/service.yaml.snap @@ -5,7 +5,7 @@ the manifest should match the snapshot when using default values: metadata: labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 name: clickhouse-operator-metrics namespace: NAMESPACE spec: diff --git a/charts/posthog/tests/clickhouse-operator/__snapshot__/serviceaccount.yaml.snap b/charts/posthog/tests/clickhouse-operator/__snapshot__/serviceaccount.yaml.snap index 503b4800c..49db327b9 100644 --- a/charts/posthog/tests/clickhouse-operator/__snapshot__/serviceaccount.yaml.snap +++ b/charts/posthog/tests/clickhouse-operator/__snapshot__/serviceaccount.yaml.snap @@ -4,6 +4,6 @@ the manifest should match the snapshot when using default values: kind: ServiceAccount metadata: labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 name: clickhouse-operator namespace: NAMESPACE diff --git a/charts/posthog/tests/clickhouse-operator/configmap.yaml b/charts/posthog/tests/clickhouse-operator/configmap.yaml index d275f7b13..dcee60a29 100644 --- a/charts/posthog/tests/clickhouse-operator/configmap.yaml +++ b/charts/posthog/tests/clickhouse-operator/configmap.yaml @@ -30,7 +30,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: ConfigMap/etc-clickhouse-operator-files metadata.namespace override via Release.Namespace should work release: @@ -46,7 +46,7 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: ConfigMap/etc-clickhouse-operator-confd-files metadata.namespace override via clickhouse.namespace should work set: @@ -62,7 +62,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: ConfigMap/etc-clickhouse-operator-confd-files metadata.namespace override via Release.Namespace should work release: @@ -78,7 +78,7 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: ConfigMap/etc-clickhouse-operator-configd-files metadata.namespace override via clickhouse.namespace should work set: @@ -94,7 +94,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: ConfigMap/etc-clickhouse-operator-configd-files metadata.namespace override via Release.Namespace should work release: @@ -110,7 +110,7 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: ConfigMap/etc-clickhouse-operator-templatesd-files metadata.namespace override via clickhouse.namespace should work set: @@ -126,7 +126,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: ConfigMap/etc-clickhouse-operator-templatesd-files metadata.namespace override via Release.Namespace should work release: @@ -142,7 +142,7 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: ConfigMap/etc-clickhouse-operator-usersd-files metadata.namespace override via clickhouse.namespace should work set: @@ -158,7 +158,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: ConfigMap/etc-clickhouse-operator-usersd-files metadata.namespace override via Release.Namespace should work release: @@ -174,4 +174,4 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 diff --git a/charts/posthog/tests/clickhouse-operator/deployment.yaml b/charts/posthog/tests/clickhouse-operator/deployment.yaml index 7c6886250..4099a5c5f 100644 --- a/charts/posthog/tests/clickhouse-operator/deployment.yaml +++ b/charts/posthog/tests/clickhouse-operator/deployment.yaml @@ -29,7 +29,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: metadata.namespace override via Release.Namespace should work release: @@ -44,4 +44,4 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 diff --git a/charts/posthog/tests/clickhouse-operator/service.yaml b/charts/posthog/tests/clickhouse-operator/service.yaml index 235ecc272..e53ce68b6 100644 --- a/charts/posthog/tests/clickhouse-operator/service.yaml +++ b/charts/posthog/tests/clickhouse-operator/service.yaml @@ -29,7 +29,7 @@ tests: namespace: custom-namespace labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: metadata.namespace override via Release.Namespace should work release: @@ -44,4 +44,4 @@ tests: namespace: custom-namespace-from-release labels: app: clickhouse-operator - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 diff --git a/charts/posthog/tests/clickhouse-operator/serviceaccount.yaml b/charts/posthog/tests/clickhouse-operator/serviceaccount.yaml index 3da6b760f..3d054cee7 100644 --- a/charts/posthog/tests/clickhouse-operator/serviceaccount.yaml +++ b/charts/posthog/tests/clickhouse-operator/serviceaccount.yaml @@ -28,7 +28,7 @@ tests: name: clickhouse-operator namespace: custom-namespace labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 - it: metadata.namespace override via Release.Namespace should work release: @@ -42,4 +42,4 @@ tests: name: clickhouse-operator namespace: custom-namespace-from-release labels: - clickhouse.altinity.com/chop: 0.18.5 + clickhouse.altinity.com/chop: 0.19.0 diff --git a/scripts/clickhouse_operator_sync.sh b/scripts/clickhouse_operator_sync.sh index e135bfb4e..9857d4b33 100755 --- a/scripts/clickhouse_operator_sync.sh +++ b/scripts/clickhouse_operator_sync.sh @@ -17,7 +17,7 @@ CHART_PATH=$(cd "$CHART_PATH_RAW" 2> /dev/null && pwd -P) TMP_FOLDER="$(mktemp -d)" trap 'rm -rf -- "$TMP_FOLDER"' EXIT -CLICKHOUSE_OPERATOR_TAG="0.18.5" +CLICKHOUSE_OPERATOR_TAG="0.19.0" OPERATOR_IMAGE="${OPERATOR_IMAGE:-altinity/clickhouse-operator:$CLICKHOUSE_OPERATOR_TAG}" METRICS_EXPORTER_IMAGE="${METRICS_EXPORTER_IMAGE:-altinity/metrics-exporter:$CLICKHOUSE_OPERATOR_TAG}"