Merge pull request #1342 from Altinity/0.23.1

0.23.1
Altinity · Feb 12, 2024 · 221d151 · 221d151
2 parents 9399454 + f5ee647
commit 221d151
Show file tree

Hide file tree

Showing 141 changed files with 5,622 additions and 693 deletions.
diff --git a/cmd/operator/app/thread_chi.go b/cmd/operator/app/thread_chi.go
@@ -61,7 +61,7 @@ func initClickHouse(ctx context.Context) {
 	// Create operator instance
 	chop.New(kubeClient, chopClient, chopConfigFile)
 	log.V(1).F().Info("Config parsed:")
-	log.Info(chop.Config().String(true))
+	log.Info("\n" + chop.Config().String(true))
 
 	// Create Informers
 	kubeInformerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(

diff --git a/config/templates.d/001-templates.json.example b/config/templates.d/001-templates.json.example
@@ -29,7 +29,7 @@
             "containers" : [
               {
                 "name": "clickhouse",
-                "image": "clickhouse/clickhouse-server:22.3",
+                "image": "clickhouse/clickhouse-server:23.8",
                 "ports": [
                   {
                     "name": "http",

diff --git a/deploy/builder/operatorhub.sh b/deploy/builder/operatorhub.sh
@@ -8,7 +8,13 @@ SRC_ROOT="$(realpath "${CUR_DIR}/../..")"
 
 # 0.9.3
 VERSION=$(cd "${SRC_ROOT}"; cat release)
-PREVIOUS_VERSION="${PREVIOUS_VERSION:-0.18.0}"
+PREVIOUS_VERSION="${PREVIOUS_VERSION}"
+
+if [[ -z "${PREVIOUS_VERSION}" ]]; then
+    echo "PREVIOUS_VERSION is not specified. Unable to proceed."
+    echo "Abort."
+    exit 1
+fi
 
 echo "PREVIOUS_VERSION: ${PREVIOUS_VERSION}"
 echo "VERSION: ${VERSION}"
@@ -81,7 +87,7 @@ rm "${CVV_FILE_TEMPLATE}"
 CHI="clickhouseinstallations.clickhouse.altinity.com"
 CHIT="clickhouseinstallationtemplates.clickhouse.altinity.com"
 CONF="clickhouseoperatorconfigurations.clickhouse.altinity.com"
-
+CHK="clickhousekeeperinstallations.clickhouse-keeper.altinity.com"
 
 # Build partial .yaml manifest(s)
 MANIFEST_PRINT_CRD="yes" \
@@ -107,6 +113,14 @@ MANIFEST_PRINT_DEPLOYMENT="no" \
 MANIFEST_PRINT_SERVICE_METRICS="no" \
 "${CUR_DIR}/cat-clickhouse-operator-install-yaml.sh" | yq "select(.metadata.name == \"${CONF}\")" > "${MANIFESTS_DIR}/${CONF}.crd.yaml"
 
+# Build partial .yaml manifest(s)
+MANIFEST_PRINT_CRD="yes" \
+MANIFEST_PRINT_RBAC_CLUSTERED="no" \
+MANIFEST_PRINT_RBAC_NAMESPACED="no" \
+MANIFEST_PRINT_DEPLOYMENT="no" \
+MANIFEST_PRINT_SERVICE_METRICS="no" \
+"${CUR_DIR}/cat-clickhouse-operator-install-yaml.sh" | yq "select(.metadata.name == \"${CHK}\")" > "${MANIFESTS_DIR}/${CHK}.crd.yaml"
+
 # TODO
 # Package file not used any more?
 #cat <<EOF > "${OPERATORHUB_DIR}/clickhouse.package.yaml"

diff --git a/deploy/builder/templates-config/templates.d/001-templates.json.example b/deploy/builder/templates-config/templates.d/001-templates.json.example
@@ -29,7 +29,7 @@
             "containers" : [
               {
                 "name": "clickhouse",
-                "image": "clickhouse/clickhouse-server:22.3",
+                "image": "clickhouse/clickhouse-server:23.8",
                 "ports": [
                   {
                     "name": "http",

diff --git a/...er/templates-operatorhub/clickhouse-operator.vVERSION.clusterserviceversion-template.yaml b/...er/templates-operatorhub/clickhouse-operator.vVERSION.clusterserviceversion-template.yaml
@@ -118,6 +118,34 @@ spec:
           - kind: PersistentVolumeClaim
             name: ''
             version: v1
+      - description: ClickHouse Keeper Installation - ClickHouse Keeper cluster instance
+        displayName: ClickHouseKeeperInstallation
+        group: clickhouse-keeper.altinity.com
+        kind: ClickHouseKeeperInstallation
+        name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com
+        version: v1
+        resources:
+          - kind: Service
+            name: ''
+            version: v1
+          - kind: Endpoint
+            name: ''
+            version: v1
+          - kind: Pod
+            name: ''
+            version: v1
+          - kind: StatefulSet
+            name: ''
+            version: v1
+          - kind: ConfigMap
+            name: ''
+            version: v1
+          - kind: Event
+            name: ''
+            version: v1
+          - kind: PersistentVolumeClaim
+            name: ''
+            version: v1
   description: |-
     ## ClickHouse
     [ClickHouse](https://clickhouse.yandex) is an open source column-oriented database management system capable of real time generation of analytical data reports.

diff --git a/deploy/devspace/dev-config.sh b/deploy/devspace/dev-config.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-[ -n "${CONFIG_LOADED}" ] && return; CONFIG_LOADED=1;
+[[ -n "${CONFIG_LOADED}" ]] && return; CONFIG_LOADED=1;
 
 CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 PROJECT_ROOT="$(realpath "${CUR_DIR}/../..")"
 MANIFEST_ROOT="$(realpath ${PROJECT_ROOT}/deploy)"
 
-OPERATOR_NAMESPACE="${OPERATOR_NAMESPACE:-dev}"
+OPERATOR_NAMESPACE="${OPERATOR_NAMESPACE:-"dev"}"
 METRICS_EXPORTER_NAMESPACE="${OPERATOR_NAMESPACE}"
 
 # yes, no, none, dev, release, prod, latest
 DEPLOY_OPERATOR="${DEPLOY_OPERATOR:-"no"}"
-CUR_RELEASE=$(cat ${PROJECT_ROOT}/release)
+CUR_RELEASE=$(cat "${PROJECT_ROOT}/release")
 MINIKUBE="${MINIKUBE:-"yes"}"
 
 echo "DEPLOY_OPERATOR=${DEPLOY_OPERATOR}"

diff --git a/deploy/devspace/dev-install.sh b/deploy/devspace/dev-install.sh
@@ -4,10 +4,10 @@ CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 source "${CUR_DIR}/dev-config.sh"
 
-echo "Create ${OPERATOR_NAMESPACE} namespace"
+echo "Create namespace to deploy the operator into: ${OPERATOR_NAMESPACE}"
 kubectl create namespace "${OPERATOR_NAMESPACE}"
 
-echo "Install operator requirements"
+echo "Install operator requirements with the following options:"
 echo "OPERATOR_NAMESPACE=${OPERATOR_NAMESPACE}"
 echo "OPERATOR_VERSION=${OPERATOR_VERSION}"
 echo "OPERATOR_IMAGE=${OPERATOR_IMAGE}"

diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -12,8 +12,8 @@ description: |-
     kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
   ```
 type: application
-version: 0.23.0
-appVersion: 0.23.0
+version: 0.23.1
+appVersion: 0.23.1
 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 b/deploy/helm/README.md
@@ -1,6 +1,6 @@
 # altinity-clickhouse-operator
 
-![Version: 0.23.0](https://img.shields.io/badge/Version-0.23.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.23.0](https://img.shields.io/badge/AppVersion-0.23.0-informational?style=flat-square)
+![Version: 0.23.1](https://img.shields.io/badge/Version-0.23.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.23.1](https://img.shields.io/badge/AppVersion-0.23.1-informational?style=flat-square)
 
 Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).
 
@@ -10,7 +10,6 @@ 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-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml
   kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
 ```
 

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

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

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

diff --git a/...ds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml b/...ds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
@@ -7,7 +7,7 @@ kind: CustomResourceDefinition
 metadata:
   name: clickhouseoperatorconfigurations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.23.0
+    clickhouse.altinity.com/chop: 0.23.1
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced

diff --git a/deploy/helm/templates/generated/Deployment-clickhouse-operator.yaml b/deploy/helm/templates/generated/Deployment-clickhouse-operator.yaml
@@ -2,9 +2,9 @@
 #
 # NAMESPACE=kube-system
 # COMMENT=
-# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.0
+# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.1
 # OPERATOR_IMAGE_PULL_POLICY=Always
-# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.0
+# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.1
 # METRICS_EXPORTER_IMAGE_PULL_POLICY=Always
 #
 # Setup Deployment for clickhouse-operator

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

diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -524,7 +524,7 @@ configs:
                   "containers" : [
                     {
                       "name": "clickhouse",
-                      "image": "clickhouse/clickhouse-server:22.3",
+                      "image": "clickhouse/clickhouse-server:23.8",
                       "ports": [
                         {
                           "name": "http",