Merge pull request #1852 from Altinity/0.25.5

0.25.5

Author: sunsingerus

.github/workflows/run_tests.yaml

@@ -68,6 +68,19 @@ jobs:
           minikube image load operator.tar
           minikube image load metrics-exporter.tar
 
+      - name: Deploy prometheus
+        run: |
+          cp ./deploy/prometheus/prometheus-sensitive-data.example.sh ./deploy/prometheus/prometheus-sensitive-data.sh
+          NO_WAIT=1 bash ./deploy/prometheus/create-prometheus.sh
+
+      - name: Deploy minio
+        run: |
+          NO_WAIT=1 bash ./deploy/minio/create-minio.sh
+
+      - name: Deploy zookeeper-operator
+        run: |
+          bash ./deploy/zookeeper/zookeeper-with-zookeeper-operator/install-zookeeper-operator.sh
+
       - name: Run Tests
         id: run-tests
         continue-on-error: true
@@ -95,7 +108,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 --no-colors --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
@@ -123,7 +136,7 @@ jobs:
           retention-days: 90
 
       - name: Test Failed
-        if: ${{ failure() }}
+        if: ${{ steps.run-tests.outputs.test_result != '0' }}
         uses: actions/github-script@v3
         with:
           script: |

config/config-dev.yaml

@@ -353,12 +353,13 @@ reconcile:
 
   # Reconcile Host scenario
   host:
-    # Whether the operator during reconcile procedure should wait for a ClickHouse host:
-    #   - to be excluded from a ClickHouse cluster
-    #   - to complete all running queries
-    #   - to be included into a ClickHouse cluster
-    # respectfully before moving forward with host reconcile
+    # The operator during reconcile procedure should wait for a ClickHouse host to achieve the following conditions:
     wait:
+      # Whether the operator during reconcile procedure should wait for a ClickHouse host:
+      #   - to be excluded from a ClickHouse cluster
+      #   - to complete all running queries
+      #   - to be included into a ClickHouse cluster
+      # respectfully before moving forward with host reconcile
       exclude: true
       queries: true
       include: false
@@ -382,6 +383,15 @@ reconcile:
         # In case probe is unspecified wait is assumed to be completed successfully.
         # Default option value is to wait.
         readiness: yes
+    # The operator during reconcile procedure should drop the following entities:
+    drop:
+      replicas:
+        # Whether the operator during reconcile procedure should drop replicas when replica is deleted
+        onDelete: yes
+        # Whether the operator during reconcile procedure should drop replicas when replica volume is lost
+        onLostVolume: yes
+        # Whether the operator during reconcile procedure should drop active replicas when replica is deleted or recreated
+        active: no
 
 ################################################
 ##

config/config.yaml

@@ -351,12 +351,13 @@ reconcile:
 
   # Reconcile Host scenario
   host:
-    # Whether the operator during reconcile procedure should wait for a ClickHouse host:
-    #   - to be excluded from a ClickHouse cluster
-    #   - to complete all running queries
-    #   - to be included into a ClickHouse cluster
-    # respectfully before moving forward with host reconcile
+    # The operator during reconcile procedure should wait for a ClickHouse host to achieve the following conditions:
     wait:
+      # Whether the operator during reconcile procedure should wait for a ClickHouse host:
+      #   - to be excluded from a ClickHouse cluster
+      #   - to complete all running queries
+      #   - to be included into a ClickHouse cluster
+      # respectfully before moving forward with host reconcile
       exclude: true
       queries: true
       include: false
@@ -380,6 +381,15 @@ reconcile:
         # In case probe is unspecified wait is assumed to be completed successfully.
         # Default option value is to wait.
         readiness: yes
+    # The operator during reconcile procedure should drop the following entities:
+    drop:
+      replicas:
+        # Whether the operator during reconcile procedure should drop replicas when replica is deleted
+        onDelete: yes
+        # Whether the operator during reconcile procedure should drop replicas when replica volume is lost
+        onLostVolume: yes
+        # Whether the operator during reconcile procedure should drop active replicas when replica is deleted or recreated
+        active: no
 
 ################################################
 ##

deploy/builder/templates-config/config.yaml

@@ -345,12 +345,13 @@ reconcile:
 
   # Reconcile Host scenario
   host:
-    # Whether the operator during reconcile procedure should wait for a ClickHouse host:
-    #   - to be excluded from a ClickHouse cluster
-    #   - to complete all running queries
-    #   - to be included into a ClickHouse cluster
-    # respectfully before moving forward with host reconcile
+    # The operator during reconcile procedure should wait for a ClickHouse host to achieve the following conditions:
     wait:
+      # Whether the operator during reconcile procedure should wait for a ClickHouse host:
+      #   - to be excluded from a ClickHouse cluster
+      #   - to complete all running queries
+      #   - to be included into a ClickHouse cluster
+      # respectfully before moving forward with host reconcile
       exclude: true
       queries: true
       include: false
@@ -374,6 +375,15 @@ reconcile:
         # In case probe is unspecified wait is assumed to be completed successfully.
         # Default option value is to wait.
         readiness: yes
+    # The operator during reconcile procedure should drop the following entities:
+    drop:
+      replicas:
+        # Whether the operator during reconcile procedure should drop replicas when replica is deleted
+        onDelete: yes
+        # Whether the operator during reconcile procedure should drop replicas when replica volume is lost
+        onLostVolume: yes
+        # Whether the operator during reconcile procedure should drop active replicas when replica is deleted or recreated
+        active: no
 
 ################################################
 ##

deploy/builder/templates-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-01-chi-chit.yaml

@@ -242,6 +242,10 @@ spec:
                   type: object
                   description: "Normalized resource completed"
                   x-kubernetes-preserve-unknown-fields: true
+                actionPlan:
+                  type: object
+                  description: "Action Plan"
+                  x-kubernetes-preserve-unknown-fields: true
                 hostsWithTablesCreated:
                   type: array
                   description: "List of hosts with tables created by the operator"
@@ -539,6 +543,26 @@ spec:
                                     Whether the operator during host launch procedure should wait for ready probe to succeed.
                                     In case probe is unspecified wait is assumed to be completed successfully.
                                     Default option value is to wait.
+                        drop:
+                          type: object
+                          properties:
+                            replicas:
+                              type: object
+                              description: |
+                                Whether the operator during reconcile procedure should drop replicas when replica is deleted or recreated
+                              properties:
+                                onDelete:
+                                  <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop replicas when replica is deleted
+                                onLostVolume:
+                                  <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop replicas when replica volume is lost
+                                active:
+                                  <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop active replicas when replica is deleted or recreated
                 reconcile:
                   <<: *TypeReconcile
                   description: "Optional, allows tuning reconciling cycle for ClickhouseInstallation from clickhouse-operator side"

deploy/builder/templates-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-02-chopconf.yaml

@@ -393,6 +393,26 @@ spec:
                                     Whether the operator during host launch procedure should wait for readiness probe to succeed.
                                     In case probe is unspecified wait is assumed to be completed successfully.
                                     Default option value is to wait.
+                        drop:
+                          type: object
+                          properties:
+                            replicas:
+                              type: object
+                              description: |
+                                Whether the operator during reconcile procedure should drop replicas when replica is deleted or recreated
+                              properties:
+                                onDelete:
+                                  <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop replicas when replica is deleted
+                                onLostVolume:
+                                  <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop replicas when replica volume is lost
+                                active:
+                                  <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop active replicas when replica is deleted or recreated
                 annotation:
                   type: object
                   description: "defines which metadata.annotations items will include or exclude during render StatefulSet, Pod, PVC resources"

deploy/helm/clickhouse-operator/Chart.yaml

@@ -13,8 +13,8 @@ description: |-
     kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml
   ```
 type: application
-version: 0.25.4
-appVersion: 0.25.4
+version: 0.25.5
+appVersion: 0.25.5
 home: https://github.com/Altinity/clickhouse-operator
 icon: https://logosandtypes.com/wp-content/uploads/2020/12/altinity.svg
 maintainers:

deploy/helm/clickhouse-operator/README.md

@@ -1,6 +1,6 @@
 # altinity-clickhouse-operator
 
-![Version: 0.25.4](https://img.shields.io/badge/Version-0.25.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.25.4](https://img.shields.io/badge/AppVersion-0.25.4-informational?style=flat-square)
+![Version: 0.25.5](https://img.shields.io/badge/Version-0.25.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.25.5](https://img.shields.io/badge/AppVersion-0.25.5-informational?style=flat-square)
 
 Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).
 

deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml

@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallation
 # PLURAL=clickhouseinstallations
 # SHORT=chi
-# OPERATOR_VERSION=0.25.4
+# OPERATOR_VERSION=0.25.5
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.25.4
+    clickhouse.altinity.com/chop: 0.25.5
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
@@ -242,6 +242,10 @@ spec:
                   type: object
                   description: "Normalized resource completed"
                   x-kubernetes-preserve-unknown-fields: true
+                actionPlan:
+                  type: object
+                  description: "Action Plan"
+                  x-kubernetes-preserve-unknown-fields: true
                 hostsWithTablesCreated:
                   type: array
                   description: "List of hosts with tables created by the operator"
@@ -539,6 +543,26 @@ spec:
                                     Whether the operator during host launch procedure should wait for ready probe to succeed.
                                     In case probe is unspecified wait is assumed to be completed successfully.
                                     Default option value is to wait.
+                        drop:
+                          type: object
+                          properties:
+                            replicas:
+                              type: object
+                              description: |
+                                Whether the operator during reconcile procedure should drop replicas when replica is deleted or recreated
+                              properties:
+                                onDelete:
+                                  !!merge <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop replicas when replica is deleted
+                                onLostVolume:
+                                  !!merge <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop replicas when replica volume is lost
+                                active:
+                                  !!merge <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop active replicas when replica is deleted or recreated
                 reconcile:
                   !!merge <<: *TypeReconcile
                   description: "Optional, allows tuning reconciling cycle for ClickhouseInstallation from clickhouse-operator side"

deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml

@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallationtemplate
 # PLURAL=clickhouseinstallationtemplates
 # SHORT=chit
-# OPERATOR_VERSION=0.25.4
+# OPERATOR_VERSION=0.25.5
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallationtemplates.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.25.4
+    clickhouse.altinity.com/chop: 0.25.5
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
@@ -242,6 +242,10 @@ spec:
                   type: object
                   description: "Normalized resource completed"
                   x-kubernetes-preserve-unknown-fields: true
+                actionPlan:
+                  type: object
+                  description: "Action Plan"
+                  x-kubernetes-preserve-unknown-fields: true
                 hostsWithTablesCreated:
                   type: array
                   description: "List of hosts with tables created by the operator"
@@ -539,6 +543,26 @@ spec:
                                     Whether the operator during host launch procedure should wait for ready probe to succeed.
                                     In case probe is unspecified wait is assumed to be completed successfully.
                                     Default option value is to wait.
+                        drop:
+                          type: object
+                          properties:
+                            replicas:
+                              type: object
+                              description: |
+                                Whether the operator during reconcile procedure should drop replicas when replica is deleted or recreated
+                              properties:
+                                onDelete:
+                                  !!merge <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop replicas when replica is deleted
+                                onLostVolume:
+                                  !!merge <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop replicas when replica volume is lost
+                                active:
+                                  !!merge <<: *TypeStringBool
+                                  description: |
+                                    Whether the operator during reconcile procedure should drop active replicas when replica is deleted or recreated
                 reconcile:
                   !!merge <<: *TypeReconcile
                   description: "Optional, allows tuning reconciling cycle for ClickhouseInstallation from clickhouse-operator side"