complex refactoring for base clickhouse version 24.8 and fix in tests suites which not in test_operator.py

Author: Slach

.github/workflows/check_helm.yaml

@@ -21,7 +21,7 @@ jobs:
         with:
           driver: docker
           container-runtime: containerd
-          kubernetes-version: v1.31.0
+          kubernetes-version: v1.31.2
           cpus: max
           memory: max
 

.github/workflows/run_tests.yaml

@@ -16,8 +16,8 @@ on:
         type: string
         required: false
 jobs:
-  run_tests:
-    name: Run Tests
+  run_operator_tests:
+    name: Run Operator Tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
         with:
           driver: docker
           container-runtime: containerd
-          kubernetes-version: v1.31.0
+          kubernetes-version: v1.31.2
           cpus: max
           memory: max
 
@@ -66,6 +66,15 @@ jobs:
           minikube image load operator.tar
           minikube image load metrics-exporter.tar
 
+      - name: Deploy prometheus
+        run: |
+          cp ./deploy/prometheus/create-prometheus.sh
+          NO_WAIT=1 ./deploy/prometheus/create-prometheus.sh
+
+      - name: Deploy minio
+        run: |
+          NO_WAIT=1 ./deploy/prometheus/create-minio.sh
+
       - name: Run Tests
         id: run-tests
         continue-on-error: true
@@ -93,7 +102,7 @@ jobs:
             test_mode="--test-to-end"
           fi
 
-          ~/venv/qa/bin/python3 ./tests/regression.py --only=/regression/e2e.test_operator/${ONLY} $test_mode --trim-results on -o short --native --log ./tests/raw.log
+          ~/venv/qa/bin/python3 ./tests/regression.py --only=/regression/e2e?test_operator/${ONLY} $test_mode --trim-results on -o short --native --log ./tests/raw.log
           test_result=$?
           ~/venv/qa/bin/tfs --no-colors transform compact ./tests/raw.log ./tests/compact.log
           ~/venv/qa/bin/tfs --no-colors transform nice ./tests/raw.log ./tests/nice.log.txt

Vagrantfile

@@ -121,15 +121,13 @@ Vagrant.configure(2) do |config|
     # docker
     curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
     add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) test"
-    apt-get install --no-install-recommends -y docker-ce pigz
+    apt-get install --no-install-recommends -y docker-ce docker-ce-cli containerd.io docker-compose-plugin pigz
 
-    # docker compose
     apt-get install -y --no-install-recommends python3-distutils
     curl -sL https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
     python3 /tmp/get-pip.py
 
-    pip3 install -U setuptools
-    pip3 install -U docker-compose
+    pip3 install -U -r ./tests/image/requirements.txt
 
     # k9s CLI
     K9S_VERSION=$(curl -sL https://github.com/derailed/k9s/releases/latest -H "Accept: application/json" | jq -r .tag_name)
@@ -170,7 +168,8 @@ Vagrant.configure(2) do |config|
 #    K8S_VERSION=${K8S_VERSION:-1.23.1}
 #    K8S_VERSION=${K8S_VERSION:-1.24.8}
 #    K8S_VERSION=${K8S_VERSION:-1.25.4}
-    K8S_VERSION=${K8S_VERSION:-1.31.1}
+#    K8S_VERSION=${K8S_VERSION:-1.31.1}
+    K8S_VERSION=${K8S_VERSION:-1.31.2}
     export VALIDATE_YAML=true
 
     killall kubectl || true

config/chi/templates.d/001-templates.json.example

@@ -29,7 +29,7 @@
             "containers" : [
               {
                 "name": "clickhouse",
-                "image": "clickhouse/clickhouse-server:23.8",
+                "image": "clickhouse/clickhouse-server:24.8",
                 "ports": [
                   {
                     "name": "http",

deploy/builder/templates-config/chi/templates.d/001-templates.json.example

@@ -29,7 +29,7 @@
             "containers" : [
               {
                 "name": "clickhouse",
-                "image": "clickhouse/clickhouse-server:23.8",
+                "image": "clickhouse/clickhouse-server:24.8",
                 "ports": [
                   {
                     "name": "http",

deploy/clickhouse-keeper/clickhouse-keeper-manually/clickhouse-keeper-1-node-256M-for-test-only.yaml

@@ -378,7 +378,7 @@ spec:
       containers:
         - name: clickhouse-keeper
           imagePullPolicy: Always
-          image: "clickhouse/clickhouse-keeper:latest-alpine"
+          image: "clickhouse/clickhouse-keeper:24.8"
           resources:
             requests:
               memory: "256M"

deploy/clickhouse-keeper/clickhouse-keeper-manually/clickhouse-keeper-3-nodes-256M-for-test-only.yaml

@@ -378,7 +378,7 @@ spec:
       containers:
         - name: clickhouse-keeper
           imagePullPolicy: Always
-          image: "clickhouse/clickhouse-keeper:latest-alpine"
+          image: "clickhouse/clickhouse-keeper:24.8"
           resources:
             requests:
               memory: "256M"

deploy/helm/clickhouse-operator/README.md

@@ -608,7 +608,7 @@ configs:
                   "containers" : [
                     {
                       "name": "clickhouse",
-                      "image": "clickhouse/clickhouse-server:23.8",
+                      "image": "clickhouse/clickhouse-server:24.8",
                       "ports": [
                         {
                           "name": "http",

deploy/helm/clickhouse-operator/values.yaml

@@ -4,7 +4,7 @@ echo "External value for \$MINIO_NAMESPACE=$MINIO_NAMESPACE"
 echo "External value for \$MINIO_OPERATOR_VERSION=$MINIO_OPERATOR_VERSION"
 
 MINIO_NAMESPACE="${MINIO_NAMESPACE:-minio}"
-MINIO_OPERATOR_VERSION="${MINIO_OPERATOR_VERSION:-v4.1.3}"
+MINIO_OPERATOR_VERSION="${MINIO_OPERATOR_VERSION:-v6.0.4}"
 
 echo "Setup minio.io"
 echo "OPTIONS"
@@ -63,7 +63,9 @@ echo "Setup minio.io operator ${MINIO_OPERATOR_VERSION} into ${MINIO_NAMESPACE}
 ## TODO: need to refactor after next minio-operator release
 
 MINIO_KUSTOMIZE_DIR="${MINIO_OPERATOR_DIR}/resources"
+sed -i -e "s/replicas: 2/replicas: 1/" $MINIO_KUSTOMIZE_DIR/base/deployment.yaml
 sed -i -e "s/name: minio-operator/name: ${MINIO_NAMESPACE}/" $MINIO_KUSTOMIZE_DIR/base/namespace.yaml
+sed -i -e "s/: restricted/: baseline/" $MINIO_KUSTOMIZE_DIR/base/namespace.yaml
 sed -i -e "s/namespace: default/namespace: ${MINIO_NAMESPACE}/" $MINIO_KUSTOMIZE_DIR/base/*.yaml
 sed -i -e "s/namespace: minio-operator/namespace: ${MINIO_NAMESPACE}/" $MINIO_KUSTOMIZE_DIR/base/*.yaml
 sed -i -e "s/namespace: minio-operator/namespace: ${MINIO_NAMESPACE}/" $MINIO_KUSTOMIZE_DIR/kustomization.yaml