Merge pull request #1283 from Altinity/0.22.1

Merge 0.22.1 to master
Altinity · Nov 30, 2023 · 111d7ef · 111d7ef
2 parents 689d35c + bb1a5db
commit 111d7ef
Show file tree

Hide file tree

Showing 32 changed files with 525 additions and 224 deletions.
diff --git a/...-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-01-chi-chit.yaml b/...-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-01-chi-chit.yaml
@@ -149,11 +149,13 @@ spec:
                 taskIDsStarted:
                   type: array
                   description: "Started task ids"
+                  nullable: true
                   items:
                     type: string
                 taskIDsCompleted:
                   type: array
                   description: "Completed task ids"
+                  nullable: true
                   items:
                     type: string
                 action:
@@ -162,6 +164,7 @@ spec:
                 actions:
                   type: array
                   description: "Actions"
+                  nullable: true
                   items:
                     type: string
                 error:
@@ -170,6 +173,7 @@ spec:
                 errors:
                   type: array
                   description: "Errors"
+                  nullable: true
                   items:
                     type: string
                 hostsUpdated:
@@ -195,16 +199,19 @@ spec:
                 pods:
                   type: array
                   description: "Pods"
+                  nullable: true
                   items:
                     type: string
                 pod-ips:
                   type: array
                   description: "Pod IPs"
+                  nullable: true
                   items:
                     type: string
                 fqdns:
                   type: array
                   description: "Pods FQDNs"
+                  nullable: true
                   items:
                     type: string
                 endpoint:
@@ -225,11 +232,13 @@ spec:
                 hostsWithTablesCreated:
                   type: array
                   description: "List of hosts with tables created by the operator"
+                  nullable: true
                   items:
                     type: string
                 usedTemplates:
                   type: array
                   description: "List of templates used to build this CHI"
+                  nullable: true
                   x-kubernetes-preserve-unknown-fields: true
                   items:
                     type: object
@@ -313,6 +322,7 @@ spec:
                         will be auto-added into ClickHouseInstallation, selectable by `chiSelector`.
                         Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly.
                       enum:
+                        - ""
                         - "auto"
                         - "manual"
                     chiSelector:
@@ -350,6 +360,7 @@ spec:
                               description: "behavior policy for unknown StatefulSet, Delete by default"
                               enum:
                                 # List ObjectsCleanupXXX constants from model
+                                - ""
                                 - "Retain"
                                 - "Delete"
                             pvc:
@@ -598,13 +609,15 @@ spec:
                                 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"

diff --git a/...-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-02-chopconf.yaml b/...-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-02-chopconf.yaml
@@ -203,6 +203,7 @@ spec:
                               - ReadOnStart. Accept CHIT updates on the operators start only.
                               - ApplyOnNextReconcile. Accept CHIT updates at all time. Apply news CHITs on next regular reconcile of the CHI
                           enum:
+                            - ""
                             - "ReadOnStart"
                             - "ApplyOnNextReconcile"
                         path:

diff --git a/...undle/clickhouse-operator-install-yaml-template-04-section-deployment-with-configmap.yaml b/...undle/clickhouse-operator-install-yaml-template-04-section-deployment-with-configmap.yaml
@@ -29,6 +29,8 @@ spec:
       annotations:
         prometheus.io/port: '8888'
         prometheus.io/scrape: 'true'
+        clickhouse-operator-metrics/port: '9999'
+        clickhouse-operator-metrics/scrape: 'true'
     spec:
       serviceAccountName: clickhouse-operator
       volumes:

diff --git a/...lates-install-bundle/clickhouse-operator-install-yaml-template-04-section-deployment.yaml b/...lates-install-bundle/clickhouse-operator-install-yaml-template-04-section-deployment.yaml
@@ -29,6 +29,8 @@ spec:
       annotations:
         prometheus.io/port: '8888'
         prometheus.io/scrape: 'true'
+        clickhouse-operator-metrics/port: '9999'
+        clickhouse-operator-metrics/scrape: 'true'
     spec:
       serviceAccountName: clickhouse-operator
       containers:

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.22.0
-appVersion: 0.22.0
+version: 0.22.1
+appVersion: 0.22.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.22.0](https://img.shields.io/badge/Version-0.22.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.22.0](https://img.shields.io/badge/AppVersion-0.22.0-informational?style=flat-square)
+![Version: 0.22.1](https://img.shields.io/badge/Version-0.22.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.22.1](https://img.shields.io/badge/AppVersion-0.22.1-informational?style=flat-square)
 
 Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).
 
@@ -49,7 +49,7 @@ For upgrade please install CRDs separately:
 | operator.image.repository | string | `"altinity/clickhouse-operator"` | image repository |
 | operator.image.tag | string | `""` | image tag (chart's appVersion value will be used if not set) |
 | operator.resources | object | `{}` | custom resource configuration |
-| podAnnotations | object | `{"prometheus.io/port":"8888","prometheus.io/scrape":"true"}` | annotations to add to the pod |
+| podAnnotations | object | `{"clickhouse-operator-metrics/port":"9999","clickhouse-operator-metrics/scrape":"true","prometheus.io/port":"8888","prometheus.io/scrape":"true"}` | annotations to add to the pod |
 | podSecurityContext | object | `{}` |  |
 | secret.create | bool | `true` | create a secret with operator credentials |
 | secret.password | string | `"clickhouse_operator_password"` | operator credentials password |

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.22.0
+# OPERATOR_VERSION=0.22.1
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.22.0
+    clickhouse.altinity.com/chop: 0.22.1
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
@@ -145,11 +145,13 @@ spec:
                 taskIDsStarted:
                   type: array
                   description: "Started task ids"
+                  nullable: true
                   items:
                     type: string
                 taskIDsCompleted:
                   type: array
                   description: "Completed task ids"
+                  nullable: true
                   items:
                     type: string
                 action:
@@ -158,6 +160,7 @@ spec:
                 actions:
                   type: array
                   description: "Actions"
+                  nullable: true
                   items:
                     type: string
                 error:
@@ -166,6 +169,7 @@ spec:
                 errors:
                   type: array
                   description: "Errors"
+                  nullable: true
                   items:
                     type: string
                 hostsUpdated:
@@ -191,16 +195,19 @@ spec:
                 pods:
                   type: array
                   description: "Pods"
+                  nullable: true
                   items:
                     type: string
                 pod-ips:
                   type: array
                   description: "Pod IPs"
+                  nullable: true
                   items:
                     type: string
                 fqdns:
                   type: array
                   description: "Pods FQDNs"
+                  nullable: true
                   items:
                     type: string
                 endpoint:
@@ -221,11 +228,13 @@ spec:
                 hostsWithTablesCreated:
                   type: array
                   description: "List of hosts with tables created by the operator"
+                  nullable: true
                   items:
                     type: string
                 usedTemplates:
                   type: array
                   description: "List of templates used to build this CHI"
+                  nullable: true
                   x-kubernetes-preserve-unknown-fields: true
                   items:
                     type: object
@@ -309,6 +318,7 @@ spec:
                         will be auto-added into ClickHouseInstallation, selectable by `chiSelector`.
                         Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly.
                       enum:
+                        - ""
                         - "auto"
                         - "manual"
                     chiSelector:
@@ -346,6 +356,7 @@ spec:
                               description: "behavior policy for unknown StatefulSet, Delete by default"
                               enum:
                                 # List ObjectsCleanupXXX constants from model
+                                - ""
                                 - "Retain"
                                 - "Delete"
                             pvc:
@@ -594,13 +605,15 @@ spec:
                                 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"

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.22.0
+# OPERATOR_VERSION=0.22.1
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallationtemplates.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.22.0
+    clickhouse.altinity.com/chop: 0.22.1
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
@@ -145,11 +145,13 @@ spec:
                 taskIDsStarted:
                   type: array
                   description: "Started task ids"
+                  nullable: true
                   items:
                     type: string
                 taskIDsCompleted:
                   type: array
                   description: "Completed task ids"
+                  nullable: true
                   items:
                     type: string
                 action:
@@ -158,6 +160,7 @@ spec:
                 actions:
                   type: array
                   description: "Actions"
+                  nullable: true
                   items:
                     type: string
                 error:
@@ -166,6 +169,7 @@ spec:
                 errors:
                   type: array
                   description: "Errors"
+                  nullable: true
                   items:
                     type: string
                 hostsUpdated:
@@ -191,16 +195,19 @@ spec:
                 pods:
                   type: array
                   description: "Pods"
+                  nullable: true
                   items:
                     type: string
                 pod-ips:
                   type: array
                   description: "Pod IPs"
+                  nullable: true
                   items:
                     type: string
                 fqdns:
                   type: array
                   description: "Pods FQDNs"
+                  nullable: true
                   items:
                     type: string
                 endpoint:
@@ -221,11 +228,13 @@ spec:
                 hostsWithTablesCreated:
                   type: array
                   description: "List of hosts with tables created by the operator"
+                  nullable: true
                   items:
                     type: string
                 usedTemplates:
                   type: array
                   description: "List of templates used to build this CHI"
+                  nullable: true
                   x-kubernetes-preserve-unknown-fields: true
                   items:
                     type: object
@@ -309,6 +318,7 @@ spec:
                         will be auto-added into ClickHouseInstallation, selectable by `chiSelector`.
                         Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly.
                       enum:
+                        - ""
                         - "auto"
                         - "manual"
                     chiSelector:
@@ -346,6 +356,7 @@ spec:
                               description: "behavior policy for unknown StatefulSet, Delete by default"
                               enum:
                                 # List ObjectsCleanupXXX constants from model
+                                - ""
                                 - "Retain"
                                 - "Delete"
                             pvc:
@@ -594,13 +605,15 @@ spec:
                                 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"

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.22.0
+    clickhouse.altinity.com/chop: 0.22.1
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
@@ -203,6 +203,7 @@ spec:
                               - ReadOnStart. Accept CHIT updates on the operators start only.
                               - ApplyOnNextReconcile. Accept CHIT updates at all time. Apply news CHITs on next regular reconcile of the CHI
                           enum:
+                            - ""
                             - "ReadOnStart"
                             - "ApplyOnNextReconcile"
                         path: