Merge pull request #1396 from Altinity/0.23.5

0.23.5
Altinity · Apr 12, 2024 · bbbf66a · bbbf66a
2 parents 75d9899 + 078df79
commit bbbf66a
Show file tree

Hide file tree

Showing 104 changed files with 6,682 additions and 998 deletions.
diff --git a/.github/workflows/release_chart.yaml b/.github/workflows/release_chart.yaml
@@ -22,7 +22,7 @@ jobs:
           sudo install cr /usr/local/bin/
           rm -f cr chart-releaser_1.4.1_linux_amd64.tar.gz
       - name: Package Chart
-        run: cr package deploy/helm
+        run: cr package deploy/helm/clickhouse-operator
       - name: Upload Release Artifacts
         run: |
           CHART_PATH=$(ls .cr-release-packages/altinity-clickhouse-operator-*.tgz)

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/deploy/devspace/dev-install.sh b/deploy/devspace/dev-install.sh
@@ -31,7 +31,7 @@ kubectl -n "${OPERATOR_NAMESPACE}" apply -f <(                         \
 )
 
 if [[ "${MINIKUBE}" == "yes" ]]; then
-    echo "Preparing for minikube"
+    echo "Building in minikube"
     case "${DEPLOY_OPERATOR}" in
         "dev")
             echo "Clean images in minikube"
@@ -40,17 +40,17 @@ if [[ "${MINIKUBE}" == "yes" ]]; then
             echo "Remove errors will be ignored."
             minikube image rm "${OPERATOR_IMAGE}" > /dev/null 2>&1
             minikube image rm "${METRICS_EXPORTER_IMAGE}" > /dev/null 2>&1
-
-            echo "Build images"
-            echo "VERBOSITY=${VERBOSITY} ${PROJECT_ROOT}/dev/image_build_all_dev.sh"
-            VERBOSITY="${VERBOSITY}" "${PROJECT_ROOT}/dev/image_build_all_dev.sh"
-            echo "Load images into minikube:"
-            echo "  1. ${OPERATOR_IMAGE}"
-            echo "  2. ${METRICS_EXPORTER_IMAGE}"
-            echo "Load images into minikube"
-            minikube image load "${OPERATOR_IMAGE}"
-            minikube image load "${METRICS_EXPORTER_IMAGE}"
-            echo "Images loaded"
+            echo "Build images in minikube"
+            echo "VERBOSITY=${VERBOSITY} MINIKUBE=yes ${PROJECT_ROOT}/dev/image_build_all_dev.sh"
+            if VERBOSITY="${VERBOSITY}" MINIKUBE=yes "${PROJECT_ROOT}/dev/image_build_all_dev.sh"; then
+                echo "OK. MINIKUBE build successful."
+            else
+                echo "########################"
+                echo "ERROR."
+                echo "MINIKUBE build has failed."
+                echo "Abort."
+                exit 1
+            fi
             ;;
     esac
 fi

diff --git a/deploy/helm/Chart.yaml → deploy/helm/clickhouse-operator/Chart.yaml b/deploy/helm/Chart.yaml → deploy/helm/clickhouse-operator/Chart.yaml
@@ -7,13 +7,13 @@ description: |-
 
   For upgrade please install CRDs separately:
   ```bash
-    kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
-    kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml
-    kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
+    kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
+    kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml
+    kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
   ```
 type: application
-version: 0.23.4
-appVersion: 0.23.4
+version: 0.23.5
+appVersion: 0.23.5
 home: https://github.com/Altinity/clickhouse-operator
 icon: https://logosandtypes.com/wp-content/uploads/2020/12/altinity.svg
 maintainers:

diff --git a/deploy/helm/README.md → deploy/helm/clickhouse-operator/README.md b/deploy/helm/README.md → deploy/helm/clickhouse-operator/README.md
@@ -1,16 +1,16 @@
 # altinity-clickhouse-operator
 
-![Version: 0.23.4](https://img.shields.io/badge/Version-0.23.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.23.4](https://img.shields.io/badge/AppVersion-0.23.4-informational?style=flat-square)
+![Version: 0.23.5](https://img.shields.io/badge/Version-0.23.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.23.5](https://img.shields.io/badge/AppVersion-0.23.5-informational?style=flat-square)
 
 Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).
 
 The ClickHouse Operator creates, configures and manages ClickHouse clusters running on Kubernetes.
 
 For upgrade please install CRDs separately:
 ```bash
-  kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
-  kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml
-  kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
+  kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
+  kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml
+  kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
 ```
 
 **Homepage:** <https://github.com/Altinity/clickhouse-operator>

diff --git a/...nstallations.clickhouse.altinity.com.yaml → ...nstallations.clickhouse.altinity.com.yaml b/...nstallations.clickhouse.altinity.com.yaml → ...nstallations.clickhouse.altinity.com.yaml
@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallation
 # PLURAL=clickhouseinstallations
 # SHORT=chi
-# OPERATOR_VERSION=0.23.4
+# OPERATOR_VERSION=0.23.5
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced

diff --git a/...iontemplates.clickhouse.altinity.com.yaml → ...iontemplates.clickhouse.altinity.com.yaml b/...iontemplates.clickhouse.altinity.com.yaml → ...iontemplates.clickhouse.altinity.com.yaml
@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallationtemplate
 # PLURAL=clickhouseinstallationtemplates
 # SHORT=chit
-# OPERATOR_VERSION=0.23.4
+# OPERATOR_VERSION=0.23.5
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallationtemplates.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced

diff --git a/...tions.clickhouse-keeper.altinity.com.yaml → ...tions.clickhouse-keeper.altinity.com.yaml b/...tions.clickhouse-keeper.altinity.com.yaml → ...tions.clickhouse-keeper.altinity.com.yaml
@@ -1,13 +1,13 @@
 # Template Parameters:
 #
-# OPERATOR_VERSION=0.23.4
+# OPERATOR_VERSION=0.23.5
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com
   labels:
-    clickhouse-keeper.altinity.com/chop: 0.23.4
+    clickhouse-keeper.altinity.com/chop: 0.23.5
 spec:
   group: clickhouse-keeper.altinity.com
   scope: Namespaced

diff --git a/...nfigurations.clickhouse.altinity.com.yaml → ...nfigurations.clickhouse.altinity.com.yaml b/...nfigurations.clickhouse.altinity.com.yaml → ...nfigurations.clickhouse.altinity.com.yaml
@@ -7,7 +7,7 @@ kind: CustomResourceDefinition
 metadata:
   name: clickhouseoperatorconfigurations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced

diff --git a/...tinity_ClickHouse_Operator_dashboard.json → ...tinity_ClickHouse_Operator_dashboard.json b/...tinity_ClickHouse_Operator_dashboard.json → ...tinity_ClickHouse_Operator_dashboard.json
diff --git a/...elm/files/ClickHouseKeeper_dashboard.json → ...tor/files/ClickHouseKeeper_dashboard.json b/...elm/files/ClickHouseKeeper_dashboard.json → ...tor/files/ClickHouseKeeper_dashboard.json
diff --git a/...m/files/ClickHouse_Queries_dashboard.json → ...r/files/ClickHouse_Queries_dashboard.json b/...m/files/ClickHouse_Queries_dashboard.json → ...r/files/ClickHouse_Queries_dashboard.json
diff --git a/deploy/helm/files/Kafka_dashboard.json → ...house-operator/files/Kafka_dashboard.json b/deploy/helm/files/Kafka_dashboard.json → ...house-operator/files/Kafka_dashboard.json
diff --git a/deploy/helm/files/Zookeeper_dashboard.json → ...e-operator/files/Zookeeper_dashboard.json b/deploy/helm/files/Zookeeper_dashboard.json → ...e-operator/files/Zookeeper_dashboard.json
diff --git a/deploy/helm/templates/_helpers.tpl → ...lickhouse-operator/templates/_helpers.tpl b/deploy/helm/templates/_helpers.tpl → ...lickhouse-operator/templates/_helpers.tpl
diff --git a/.../helm/templates/additional-resources.yaml → ...rator/templates/additional-resources.yaml b/.../helm/templates/additional-resources.yaml → ...rator/templates/additional-resources.yaml
diff --git a/deploy/helm/templates/dashboards-secret.yaml → ...operator/templates/dashboards-secret.yaml b/deploy/helm/templates/dashboards-secret.yaml → ...operator/templates/dashboards-secret.yaml
diff --git a/...Role-clickhouse-operator-kube-system.yaml → ...Role-clickhouse-operator-kube-system.yaml b/...Role-clickhouse-operator-kube-system.yaml → ...Role-clickhouse-operator-kube-system.yaml
diff --git a/...ding-clickhouse-operator-kube-system.yaml → ...ding-clickhouse-operator-kube-system.yaml b/...ding-clickhouse-operator-kube-system.yaml → ...ding-clickhouse-operator-kube-system.yaml
diff --git a/...-etc-clickhouse-operator-confd-files.yaml → ...-etc-clickhouse-operator-confd-files.yaml b/...-etc-clickhouse-operator-confd-files.yaml → ...-etc-clickhouse-operator-confd-files.yaml
diff --git a/...tc-clickhouse-operator-configd-files.yaml → ...tc-clickhouse-operator-configd-files.yaml b/...tc-clickhouse-operator-configd-files.yaml → ...tc-clickhouse-operator-configd-files.yaml
diff --git a/...figMap-etc-clickhouse-operator-files.yaml → ...figMap-etc-clickhouse-operator-files.yaml b/...figMap-etc-clickhouse-operator-files.yaml → ...figMap-etc-clickhouse-operator-files.yaml
diff --git a/...clickhouse-operator-templatesd-files.yaml → ...clickhouse-operator-templatesd-files.yaml b/...clickhouse-operator-templatesd-files.yaml → ...clickhouse-operator-templatesd-files.yaml
diff --git a/...etc-clickhouse-operator-usersd-files.yaml → ...etc-clickhouse-operator-usersd-files.yaml b/...etc-clickhouse-operator-usersd-files.yaml → ...etc-clickhouse-operator-usersd-files.yaml
diff --git a/...rated/Deployment-clickhouse-operator.yaml → ...rated/Deployment-clickhouse-operator.yaml b/...rated/Deployment-clickhouse-operator.yaml → ...rated/Deployment-clickhouse-operator.yaml
@@ -2,9 +2,9 @@
 #
 # NAMESPACE=kube-system
 # COMMENT=
-# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.4
+# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.5
 # OPERATOR_IMAGE_PULL_POLICY=Always
-# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.4
+# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.5
 # METRICS_EXPORTER_IMAGE_PULL_POLICY=Always
 #
 # Setup Deployment for clickhouse-operator

diff --git a/...generated/Secret-clickhouse-operator.yaml → ...generated/Secret-clickhouse-operator.yaml b/...generated/Secret-clickhouse-operator.yaml → ...generated/Secret-clickhouse-operator.yaml
@@ -3,7 +3,7 @@
 # Template parameters available:
 #   NAMESPACE=kube-system
 #   COMMENT=
-#   OPERATOR_VERSION=0.23.4
+#   OPERATOR_VERSION=0.23.5
 #   CH_USERNAME_SECRET_PLAIN=clickhouse_operator
 #   CH_PASSWORD_SECRET_PLAIN=clickhouse_operator_password
 #

diff --git a/.../Service-clickhouse-operator-metrics.yaml → .../Service-clickhouse-operator-metrics.yaml b/.../Service-clickhouse-operator-metrics.yaml → .../Service-clickhouse-operator-metrics.yaml
diff --git a/...d/ServiceAccount-clickhouse-operator.yaml → ...d/ServiceAccount-clickhouse-operator.yaml b/...d/ServiceAccount-clickhouse-operator.yaml → ...d/ServiceAccount-clickhouse-operator.yaml
diff --git a/deploy/helm/templates/servicemonitor.yaml → ...se-operator/templates/servicemonitor.yaml b/deploy/helm/templates/servicemonitor.yaml → ...se-operator/templates/servicemonitor.yaml
diff --git a/deploy/helm/values.yaml → deploy/helm/clickhouse-operator/values.yaml b/deploy/helm/values.yaml → deploy/helm/clickhouse-operator/values.yaml
diff --git a/deploy/operator/clickhouse-operator-install-ansible.yaml b/deploy/operator/clickhouse-operator-install-ansible.yaml
@@ -11,14 +11,14 @@
 # SINGULAR=clickhouseinstallation
 # PLURAL=clickhouseinstallations
 # SHORT=chi
-# OPERATOR_VERSION=0.23.4
+# OPERATOR_VERSION=0.23.5
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
@@ -1237,14 +1237,14 @@ spec:
 # SINGULAR=clickhouseinstallationtemplate
 # PLURAL=clickhouseinstallationtemplates
 # SHORT=chit
-# OPERATOR_VERSION=0.23.4
+# OPERATOR_VERSION=0.23.5
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallationtemplates.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
@@ -2466,7 +2466,7 @@ kind: CustomResourceDefinition
 metadata:
   name: clickhouseoperatorconfigurations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
@@ -2881,14 +2881,14 @@ spec:
 ---
 # Template Parameters:
 #
-# OPERATOR_VERSION=0.23.4
+# OPERATOR_VERSION=0.23.5
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com
   labels:
-    clickhouse-keeper.altinity.com/chop: 0.23.4
+    clickhouse-keeper.altinity.com/chop: 0.23.5
 spec:
   group: clickhouse-keeper.altinity.com
   scope: Namespaced
@@ -3157,7 +3157,7 @@ metadata:
   name: clickhouse-operator
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
 ---
 # Template Parameters:
 #
@@ -3183,7 +3183,7 @@ metadata:
   name: clickhouse-operator
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
 rules:
 
   #
@@ -3402,7 +3402,7 @@ metadata:
   name: clickhouse-operator
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -3424,7 +3424,7 @@ metadata:
   name: etc-clickhouse-operator-files
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
     app: clickhouse-operator
 data:
   config.yaml: |
@@ -3796,7 +3796,7 @@ metadata:
   name: etc-clickhouse-operator-confd-files
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
     app: clickhouse-operator
 data:
 ---
@@ -3812,7 +3812,7 @@ metadata:
   name: etc-clickhouse-operator-configd-files
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
     app: clickhouse-operator
 data:
   01-clickhouse-01-listen.xml: |
@@ -3911,7 +3911,7 @@ metadata:
   name: etc-clickhouse-operator-templatesd-files
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
     app: clickhouse-operator
 data:
   001-templates.json.example: |
@@ -4011,7 +4011,7 @@ metadata:
   name: etc-clickhouse-operator-usersd-files
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
     app: clickhouse-operator
 data:
   01-clickhouse-operator-profile.xml: |
@@ -4066,7 +4066,7 @@ data:
 # Template parameters available:
 #   NAMESPACE={{ namespace }}
 #   COMMENT=
-#   OPERATOR_VERSION=0.23.4
+#   OPERATOR_VERSION=0.23.5
 #   CH_USERNAME_SECRET_PLAIN=clickhouse_operator
 #   CH_PASSWORD_SECRET_PLAIN={{ password }}
 #
@@ -4076,7 +4076,7 @@ metadata:
   name: clickhouse-operator
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
     app: clickhouse-operator
 type: Opaque
 stringData:
@@ -4087,9 +4087,9 @@ stringData:
 #
 # NAMESPACE={{ namespace }}
 # COMMENT=
-# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.4
+# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.5
 # OPERATOR_IMAGE_PULL_POLICY=Always
-# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.4
+# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.5
 # METRICS_EXPORTER_IMAGE_PULL_POLICY=Always
 #
 # Setup Deployment for clickhouse-operator
@@ -4100,7 +4100,7 @@ metadata:
   name: clickhouse-operator
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
     app: clickhouse-operator
 spec:
   replicas: 1
@@ -4136,7 +4136,7 @@ spec:
             name: etc-clickhouse-operator-usersd-files
       containers:
         - name: clickhouse-operator
-          image: altinity/clickhouse-operator:0.23.4
+          image: altinity/clickhouse-operator:0.23.5
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder
@@ -4204,7 +4204,7 @@ spec:
               name: metrics
 
         - name: metrics-exporter
-          image: altinity/metrics-exporter:0.23.4
+          image: altinity/metrics-exporter:0.23.5
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder
@@ -4287,7 +4287,7 @@ metadata:
   name: clickhouse-operator-metrics
   namespace: {{ namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.23.4
+    clickhouse.altinity.com/chop: 0.23.5
     app: clickhouse-operator
 spec:
   ports: