diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml index c2ef5e22c..b31489ffc 100644 --- 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.1 -appVersion: 0.23.1 +version: 0.23.2 +appVersion: 0.23.2 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 index f8ed72a8c..7cd8c9be8 100644 --- a/deploy/helm/README.md +++ b/deploy/helm/README.md @@ -1,6 +1,6 @@ # altinity-clickhouse-operator -![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) +![Version: 0.23.2](https://img.shields.io/badge/Version-0.23.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.23.2](https://img.shields.io/badge/AppVersion-0.23.2-informational?style=flat-square) Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator). diff --git a/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml b/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml index f9f6b42f6..f16c17d15 100644 --- a/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml +++ b/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml @@ -4,14 +4,14 @@ # SINGULAR=clickhouseinstallation # PLURAL=clickhouseinstallations # SHORT=chi -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced diff --git a/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml b/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml index 7175710cc..29451b1ba 100644 --- a/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml +++ b/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml @@ -4,14 +4,14 @@ # SINGULAR=clickhouseinstallationtemplate # PLURAL=clickhouseinstallationtemplates # SHORT=chit -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallationtemplates.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced diff --git a/deploy/helm/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml b/deploy/helm/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml index 3831166b9..ee51d6aab 100644 --- a/deploy/helm/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml +++ b/deploy/helm/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml @@ -1,13 +1,13 @@ # Template Parameters: # -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com labels: - clickhouse-keeper.altinity.com/chop: 0.23.1 + clickhouse-keeper.altinity.com/chop: 0.23.2 spec: group: clickhouse-keeper.altinity.com scope: Namespaced diff --git a/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml b/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml index 26ccdc89a..7de8b2d9b 100644 --- a/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml +++ b/deploy/helm/crds/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.1 + clickhouse.altinity.com/chop: 0.23.2 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 index 1dcf5bf02..5750be3cd 100644 --- 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.1 +# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.2 # OPERATOR_IMAGE_PULL_POLICY=Always -# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.1 +# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.2 # 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 index 47a5ddfe9..4e8526341 100644 --- 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.1 +# OPERATOR_VERSION=0.23.2 # CH_USERNAME_SECRET_PLAIN=clickhouse_operator # CH_PASSWORD_SECRET_PLAIN=clickhouse_operator_password # diff --git a/deploy/operator/clickhouse-operator-install-ansible.yaml b/deploy/operator/clickhouse-operator-install-ansible.yaml index 5b3649aff..c7a74ed9b 100644 --- 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.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -1228,14 +1228,14 @@ spec: # SINGULAR=clickhouseinstallationtemplate # PLURAL=clickhouseinstallationtemplates # SHORT=chit -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallationtemplates.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2448,7 +2448,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseoperatorconfigurations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2863,14 +2863,14 @@ spec: --- # Template Parameters: # -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com labels: - clickhouse-keeper.altinity.com/chop: 0.23.1 + clickhouse-keeper.altinity.com/chop: 0.23.2 spec: group: clickhouse-keeper.altinity.com scope: Namespaced @@ -3139,7 +3139,7 @@ metadata: name: clickhouse-operator namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 --- # Template Parameters: # @@ -3165,7 +3165,7 @@ metadata: name: clickhouse-operator namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 rules: # @@ -3384,7 +3384,7 @@ metadata: name: clickhouse-operator namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -3406,7 +3406,7 @@ metadata: name: etc-clickhouse-operator-files namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: config.yaml: | @@ -3767,7 +3767,7 @@ metadata: name: etc-clickhouse-operator-confd-files namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: --- @@ -3783,7 +3783,7 @@ metadata: name: etc-clickhouse-operator-configd-files namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-01-listen.xml: | @@ -3882,7 +3882,7 @@ metadata: name: etc-clickhouse-operator-templatesd-files namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 001-templates.json.example: | @@ -3982,7 +3982,7 @@ metadata: name: etc-clickhouse-operator-usersd-files namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-operator-profile.xml: | @@ -4037,7 +4037,7 @@ data: # Template parameters available: # NAMESPACE={{ namespace }} # COMMENT= -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # CH_USERNAME_SECRET_PLAIN=clickhouse_operator # CH_PASSWORD_SECRET_PLAIN={{ password }} # @@ -4047,7 +4047,7 @@ metadata: name: clickhouse-operator namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator type: Opaque stringData: @@ -4058,9 +4058,9 @@ stringData: # # NAMESPACE={{ namespace }} # COMMENT= -# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.1 +# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.2 # OPERATOR_IMAGE_PULL_POLICY=Always -# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.1 +# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.2 # METRICS_EXPORTER_IMAGE_PULL_POLICY=Always # # Setup Deployment for clickhouse-operator @@ -4071,7 +4071,7 @@ metadata: name: clickhouse-operator namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: replicas: 1 @@ -4107,7 +4107,7 @@ spec: name: etc-clickhouse-operator-usersd-files containers: - name: clickhouse-operator - image: altinity/clickhouse-operator:0.23.1 + image: altinity/clickhouse-operator:0.23.2 imagePullPolicy: Always volumeMounts: - name: etc-clickhouse-operator-folder @@ -4175,7 +4175,7 @@ spec: name: metrics - name: metrics-exporter - image: altinity/metrics-exporter:0.23.1 + image: altinity/metrics-exporter:0.23.2 imagePullPolicy: Always volumeMounts: - name: etc-clickhouse-operator-folder @@ -4258,7 +4258,7 @@ metadata: name: clickhouse-operator-metrics namespace: {{ namespace }} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: ports: diff --git a/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml b/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml index 13bce59d3..2f6461983 100644 --- a/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml +++ b/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml @@ -4,14 +4,14 @@ # SINGULAR=clickhouseinstallation # PLURAL=clickhouseinstallations # SHORT=chi -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: clickhouseinstallations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -1211,14 +1211,14 @@ spec: # SINGULAR=clickhouseinstallationtemplate # PLURAL=clickhouseinstallationtemplates # SHORT=chit -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: clickhouseinstallationtemplates.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2419,7 +2419,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseoperatorconfigurations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2824,14 +2824,14 @@ spec: --- # Template Parameters: # -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com labels: - clickhouse-keeper.altinity.com/chop: 0.23.1 + clickhouse-keeper.altinity.com/chop: 0.23.2 spec: group: clickhouse-keeper.altinity.com scope: Namespaced @@ -3099,7 +3099,7 @@ metadata: name: clickhouse-operator namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 # Template Parameters: # @@ -3124,7 +3124,7 @@ metadata: name: clickhouse-operator-kube-system #namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 rules: # # Core API group @@ -3333,7 +3333,7 @@ metadata: name: clickhouse-operator-kube-system #namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -3355,7 +3355,7 @@ metadata: name: etc-clickhouse-operator-files namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: config.yaml: | @@ -3715,7 +3715,7 @@ metadata: name: etc-clickhouse-operator-confd-files namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: --- @@ -3731,7 +3731,7 @@ metadata: name: etc-clickhouse-operator-configd-files namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-01-listen.xml: | @@ -3825,7 +3825,7 @@ metadata: name: etc-clickhouse-operator-templatesd-files namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 001-templates.json.example: | @@ -3923,7 +3923,7 @@ metadata: name: etc-clickhouse-operator-usersd-files namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-operator-profile.xml: | @@ -3977,7 +3977,7 @@ data: # Template parameters available: # NAMESPACE=kube-system # COMMENT= -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # CH_USERNAME_SECRET_PLAIN=clickhouse_operator # CH_PASSWORD_SECRET_PLAIN=clickhouse_operator_password # @@ -3987,7 +3987,7 @@ metadata: name: clickhouse-operator namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator type: Opaque stringData: @@ -3998,9 +3998,9 @@ stringData: # # NAMESPACE=kube-system # COMMENT= -# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.1 +# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.2 # OPERATOR_IMAGE_PULL_POLICY=Always -# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.1 +# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.2 # METRICS_EXPORTER_IMAGE_PULL_POLICY=Always # # Setup Deployment for clickhouse-operator @@ -4011,7 +4011,7 @@ metadata: name: clickhouse-operator namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: replicas: 1 @@ -4047,7 +4047,7 @@ spec: name: etc-clickhouse-operator-usersd-files containers: - name: clickhouse-operator - image: altinity/clickhouse-operator:0.23.1 + image: altinity/clickhouse-operator:0.23.2 imagePullPolicy: Always volumeMounts: - name: etc-clickhouse-operator-folder @@ -4113,7 +4113,7 @@ spec: - containerPort: 9999 name: metrics - name: metrics-exporter - image: altinity/metrics-exporter:0.23.1 + image: altinity/metrics-exporter:0.23.2 imagePullPolicy: Always volumeMounts: - name: etc-clickhouse-operator-folder @@ -4195,7 +4195,7 @@ metadata: name: clickhouse-operator-metrics namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: ports: diff --git a/deploy/operator/clickhouse-operator-install-bundle.yaml b/deploy/operator/clickhouse-operator-install-bundle.yaml index ab3a6748f..0c80de311 100644 --- a/deploy/operator/clickhouse-operator-install-bundle.yaml +++ b/deploy/operator/clickhouse-operator-install-bundle.yaml @@ -4,14 +4,14 @@ # SINGULAR=clickhouseinstallation # PLURAL=clickhouseinstallations # SHORT=chi -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -1221,14 +1221,14 @@ spec: # SINGULAR=clickhouseinstallationtemplate # PLURAL=clickhouseinstallationtemplates # SHORT=chit -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallationtemplates.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2441,7 +2441,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseoperatorconfigurations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2856,14 +2856,14 @@ spec: --- # Template Parameters: # -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com labels: - clickhouse-keeper.altinity.com/chop: 0.23.1 + clickhouse-keeper.altinity.com/chop: 0.23.2 spec: group: clickhouse-keeper.altinity.com scope: Namespaced @@ -3132,7 +3132,7 @@ metadata: name: clickhouse-operator namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 --- # Template Parameters: # @@ -3158,7 +3158,7 @@ metadata: name: clickhouse-operator-kube-system #namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 rules: # @@ -3377,7 +3377,7 @@ metadata: name: clickhouse-operator-kube-system #namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -3399,7 +3399,7 @@ metadata: name: etc-clickhouse-operator-files namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: config.yaml: | @@ -3760,7 +3760,7 @@ metadata: name: etc-clickhouse-operator-confd-files namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: --- @@ -3776,7 +3776,7 @@ metadata: name: etc-clickhouse-operator-configd-files namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-01-listen.xml: | @@ -3875,7 +3875,7 @@ metadata: name: etc-clickhouse-operator-templatesd-files namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 001-templates.json.example: | @@ -3975,7 +3975,7 @@ metadata: name: etc-clickhouse-operator-usersd-files namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-operator-profile.xml: | @@ -4030,7 +4030,7 @@ data: # Template parameters available: # NAMESPACE=kube-system # COMMENT= -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # CH_USERNAME_SECRET_PLAIN=clickhouse_operator # CH_PASSWORD_SECRET_PLAIN=clickhouse_operator_password # @@ -4040,7 +4040,7 @@ metadata: name: clickhouse-operator namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator type: Opaque stringData: @@ -4051,9 +4051,9 @@ stringData: # # NAMESPACE=kube-system # COMMENT= -# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.1 +# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.2 # OPERATOR_IMAGE_PULL_POLICY=Always -# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.1 +# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.2 # METRICS_EXPORTER_IMAGE_PULL_POLICY=Always # # Setup Deployment for clickhouse-operator @@ -4064,7 +4064,7 @@ metadata: name: clickhouse-operator namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: replicas: 1 @@ -4100,7 +4100,7 @@ spec: name: etc-clickhouse-operator-usersd-files containers: - name: clickhouse-operator - image: altinity/clickhouse-operator:0.23.1 + image: altinity/clickhouse-operator:0.23.2 imagePullPolicy: Always volumeMounts: - name: etc-clickhouse-operator-folder @@ -4168,7 +4168,7 @@ spec: name: metrics - name: metrics-exporter - image: altinity/metrics-exporter:0.23.1 + image: altinity/metrics-exporter:0.23.2 imagePullPolicy: Always volumeMounts: - name: etc-clickhouse-operator-folder @@ -4251,7 +4251,7 @@ metadata: name: clickhouse-operator-metrics namespace: kube-system labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: ports: diff --git a/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml b/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml index 3b0111a4a..dc8e8dac7 100644 --- a/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml +++ b/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml @@ -4,14 +4,14 @@ # SINGULAR=clickhouseinstallation # PLURAL=clickhouseinstallations # SHORT=chi -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: clickhouseinstallations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -1211,14 +1211,14 @@ spec: # SINGULAR=clickhouseinstallationtemplate # PLURAL=clickhouseinstallationtemplates # SHORT=chit -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: clickhouseinstallationtemplates.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2419,7 +2419,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseoperatorconfigurations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2824,14 +2824,14 @@ spec: --- # Template Parameters: # -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com labels: - clickhouse-keeper.altinity.com/chop: 0.23.1 + clickhouse-keeper.altinity.com/chop: 0.23.2 spec: group: clickhouse-keeper.altinity.com scope: Namespaced @@ -3099,7 +3099,7 @@ metadata: name: clickhouse-operator namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 # Template Parameters: # @@ -3124,7 +3124,7 @@ metadata: name: clickhouse-operator-${OPERATOR_NAMESPACE} #namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 rules: # # Core API group @@ -3333,7 +3333,7 @@ metadata: name: clickhouse-operator-${OPERATOR_NAMESPACE} #namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -3355,7 +3355,7 @@ metadata: name: etc-clickhouse-operator-files namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: config.yaml: | @@ -3715,7 +3715,7 @@ metadata: name: etc-clickhouse-operator-confd-files namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: --- @@ -3731,7 +3731,7 @@ metadata: name: etc-clickhouse-operator-configd-files namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-01-listen.xml: | @@ -3825,7 +3825,7 @@ metadata: name: etc-clickhouse-operator-templatesd-files namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 001-templates.json.example: | @@ -3923,7 +3923,7 @@ metadata: name: etc-clickhouse-operator-usersd-files namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-operator-profile.xml: | @@ -3977,7 +3977,7 @@ data: # Template parameters available: # NAMESPACE=${OPERATOR_NAMESPACE} # COMMENT= -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # CH_USERNAME_SECRET_PLAIN=clickhouse_operator # CH_PASSWORD_SECRET_PLAIN=clickhouse_operator_password # @@ -3987,7 +3987,7 @@ metadata: name: clickhouse-operator namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator type: Opaque stringData: @@ -4011,7 +4011,7 @@ metadata: name: clickhouse-operator namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: replicas: 1 @@ -4195,7 +4195,7 @@ metadata: name: clickhouse-operator-metrics namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: ports: diff --git a/deploy/operator/clickhouse-operator-install-template.yaml b/deploy/operator/clickhouse-operator-install-template.yaml index f93792da3..030258686 100644 --- a/deploy/operator/clickhouse-operator-install-template.yaml +++ b/deploy/operator/clickhouse-operator-install-template.yaml @@ -4,14 +4,14 @@ # SINGULAR=clickhouseinstallation # PLURAL=clickhouseinstallations # SHORT=chi -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -1221,14 +1221,14 @@ spec: # SINGULAR=clickhouseinstallationtemplate # PLURAL=clickhouseinstallationtemplates # SHORT=chit -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallationtemplates.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2441,7 +2441,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseoperatorconfigurations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2856,14 +2856,14 @@ spec: --- # Template Parameters: # -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com labels: - clickhouse-keeper.altinity.com/chop: 0.23.1 + clickhouse-keeper.altinity.com/chop: 0.23.2 spec: group: clickhouse-keeper.altinity.com scope: Namespaced @@ -3132,7 +3132,7 @@ metadata: name: clickhouse-operator namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 --- # Template Parameters: # @@ -3158,7 +3158,7 @@ metadata: name: clickhouse-operator-${OPERATOR_NAMESPACE} #namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 rules: # @@ -3377,7 +3377,7 @@ metadata: name: clickhouse-operator-${OPERATOR_NAMESPACE} #namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -3399,7 +3399,7 @@ metadata: name: etc-clickhouse-operator-files namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: config.yaml: | @@ -3760,7 +3760,7 @@ metadata: name: etc-clickhouse-operator-confd-files namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: --- @@ -3776,7 +3776,7 @@ metadata: name: etc-clickhouse-operator-configd-files namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-01-listen.xml: | @@ -3875,7 +3875,7 @@ metadata: name: etc-clickhouse-operator-templatesd-files namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 001-templates.json.example: | @@ -3975,7 +3975,7 @@ metadata: name: etc-clickhouse-operator-usersd-files namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-operator-profile.xml: | @@ -4030,7 +4030,7 @@ data: # Template parameters available: # NAMESPACE=${OPERATOR_NAMESPACE} # COMMENT= -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # CH_USERNAME_SECRET_PLAIN=clickhouse_operator # CH_PASSWORD_SECRET_PLAIN=clickhouse_operator_password # @@ -4040,7 +4040,7 @@ metadata: name: clickhouse-operator namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator type: Opaque stringData: @@ -4064,7 +4064,7 @@ metadata: name: clickhouse-operator namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: replicas: 1 @@ -4251,7 +4251,7 @@ metadata: name: clickhouse-operator-metrics namespace: ${OPERATOR_NAMESPACE} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: ports: diff --git a/deploy/operator/clickhouse-operator-install-tf.yaml b/deploy/operator/clickhouse-operator-install-tf.yaml index c3db45f3c..ee8aca9e2 100644 --- a/deploy/operator/clickhouse-operator-install-tf.yaml +++ b/deploy/operator/clickhouse-operator-install-tf.yaml @@ -11,14 +11,14 @@ # SINGULAR=clickhouseinstallation # PLURAL=clickhouseinstallations # SHORT=chi -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -1228,14 +1228,14 @@ spec: # SINGULAR=clickhouseinstallationtemplate # PLURAL=clickhouseinstallationtemplates # SHORT=chit -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallationtemplates.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2448,7 +2448,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseoperatorconfigurations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2863,14 +2863,14 @@ spec: --- # Template Parameters: # -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com labels: - clickhouse-keeper.altinity.com/chop: 0.23.1 + clickhouse-keeper.altinity.com/chop: 0.23.2 spec: group: clickhouse-keeper.altinity.com scope: Namespaced @@ -3139,7 +3139,7 @@ metadata: name: clickhouse-operator namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 --- # Template Parameters: # @@ -3165,7 +3165,7 @@ metadata: name: clickhouse-operator namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 rules: # @@ -3384,7 +3384,7 @@ metadata: name: clickhouse-operator namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -3406,7 +3406,7 @@ metadata: name: etc-clickhouse-operator-files namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: config.yaml: | @@ -3767,7 +3767,7 @@ metadata: name: etc-clickhouse-operator-confd-files namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: --- @@ -3783,7 +3783,7 @@ metadata: name: etc-clickhouse-operator-configd-files namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-01-listen.xml: | @@ -3882,7 +3882,7 @@ metadata: name: etc-clickhouse-operator-templatesd-files namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 001-templates.json.example: | @@ -3982,7 +3982,7 @@ metadata: name: etc-clickhouse-operator-usersd-files namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator data: 01-clickhouse-operator-profile.xml: | @@ -4037,7 +4037,7 @@ data: # Template parameters available: # NAMESPACE=${namespace} # COMMENT= -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # CH_USERNAME_SECRET_PLAIN=clickhouse_operator # CH_PASSWORD_SECRET_PLAIN=${password} # @@ -4047,7 +4047,7 @@ metadata: name: clickhouse-operator namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator type: Opaque stringData: @@ -4058,9 +4058,9 @@ stringData: # # NAMESPACE=${namespace} # COMMENT= -# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.1 +# OPERATOR_IMAGE=altinity/clickhouse-operator:0.23.2 # OPERATOR_IMAGE_PULL_POLICY=Always -# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.1 +# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.23.2 # METRICS_EXPORTER_IMAGE_PULL_POLICY=Always # # Setup Deployment for clickhouse-operator @@ -4071,7 +4071,7 @@ metadata: name: clickhouse-operator namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: replicas: 1 @@ -4107,7 +4107,7 @@ spec: name: etc-clickhouse-operator-usersd-files containers: - name: clickhouse-operator - image: altinity/clickhouse-operator:0.23.1 + image: altinity/clickhouse-operator:0.23.2 imagePullPolicy: Always volumeMounts: - name: etc-clickhouse-operator-folder @@ -4175,7 +4175,7 @@ spec: name: metrics - name: metrics-exporter - image: altinity/metrics-exporter:0.23.1 + image: altinity/metrics-exporter:0.23.2 imagePullPolicy: Always volumeMounts: - name: etc-clickhouse-operator-folder @@ -4258,7 +4258,7 @@ metadata: name: clickhouse-operator-metrics namespace: ${namespace} labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 app: clickhouse-operator spec: ports: diff --git a/deploy/operator/parts/crd.yaml b/deploy/operator/parts/crd.yaml index a29a7caf4..ecdc0241b 100644 --- a/deploy/operator/parts/crd.yaml +++ b/deploy/operator/parts/crd.yaml @@ -4,14 +4,14 @@ # SINGULAR=clickhouseinstallation # PLURAL=clickhouseinstallations # SHORT=chi -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -1221,14 +1221,14 @@ spec: # SINGULAR=clickhouseinstallationtemplate # PLURAL=clickhouseinstallationtemplates # SHORT=chit -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhouseinstallationtemplates.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2441,7 +2441,7 @@ kind: CustomResourceDefinition metadata: name: clickhouseoperatorconfigurations.clickhouse.altinity.com labels: - clickhouse.altinity.com/chop: 0.23.1 + clickhouse.altinity.com/chop: 0.23.2 spec: group: clickhouse.altinity.com scope: Namespaced @@ -2856,14 +2856,14 @@ spec: --- # Template Parameters: # -# OPERATOR_VERSION=0.23.1 +# OPERATOR_VERSION=0.23.2 # apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com labels: - clickhouse-keeper.altinity.com/chop: 0.23.1 + clickhouse-keeper.altinity.com/chop: 0.23.2 spec: group: clickhouse-keeper.altinity.com scope: Namespaced diff --git a/dev/build_manifests.sh b/dev/build_manifests.sh new file mode 100755 index 000000000..bbdbad8af --- /dev/null +++ b/dev/build_manifests.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Source configuration +CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +source "${CUR_DIR}/go_build_config.sh" + +# Build clickhouse-operator install .yaml manifest +source "${MANIFESTS_ROOT}/builder/build-clickhouse-operator-configs.sh" +# Build clickhouse-operator install .yaml manifest +source "${MANIFESTS_ROOT}/builder/build-clickhouse-operator-install-yaml.sh" diff --git a/dev/go_build_all.sh b/dev/go_build_all.sh index 2a9d3243d..5788e7de6 100755 --- a/dev/go_build_all.sh +++ b/dev/go_build_all.sh @@ -1,18 +1,25 @@ #!/bin/bash -# Build clickhouse-operator -# Do not forget to update version - -# Source configuration CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" -PROJECT_ROOT="$(realpath "${CUR_DIR}/..")" +echo "Build manifests" +source "${CUR_DIR}/build_manifests.sh" +CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +echo "Build metrics-exporter" source "${CUR_DIR}/go_build_metrics_exporter.sh" + CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +echo "Build operator" source "${CUR_DIR}/go_build_operator.sh" + CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +echo "Build helm charts" source "${CUR_DIR}/generate_helm_chart.sh" + CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +echo "Run source checker" source "${CUR_DIR}/run_gocard.sh" + CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" -source "${CUR_DIR}/run_gosec.sh" \ No newline at end of file +echo "Run security checker" +source "${CUR_DIR}/run_gosec.sh" diff --git a/dev/go_build_config.sh b/dev/go_build_config.sh index a6f00e1a1..bd4d87088 100755 --- a/dev/go_build_config.sh +++ b/dev/go_build_config.sh @@ -13,7 +13,7 @@ REPO="github.com/altinity/clickhouse-operator" # 0.9.3 VERSION=$(cd "${SRC_ROOT}"; cat release) # 885c3f7 -GIT_SHA=$(cd "${CUR_DIR}"; git rev-parse --short HEAD) +GIT_SHA=$(cd "${SRC_ROOT}"; git rev-parse --short HEAD) # 2020-03-07 14:54:56 NOW=$(date "+%FT%T") @@ -21,8 +21,8 @@ RELEASE="1" # Operator binary name can be specified externally # Default - put 'clickhouse-operator' into cur dir -OPERATOR_BIN="${OPERATOR_BIN:-${SRC_ROOT}/dev/bin/clickhouse-operator}" +OPERATOR_BIN="${OPERATOR_BIN:-"${SRC_ROOT}/dev/bin/clickhouse-operator"}" # Metrics exporter binary name can be specified externally # Default - put 'metrics-exporter' into cur dir -METRICS_EXPORTER_BIN="${METRICS_EXPORTER_BIN:-${SRC_ROOT}/dev/bin/metrics-exporter}" +METRICS_EXPORTER_BIN="${METRICS_EXPORTER_BIN:-"${SRC_ROOT}/dev/bin/metrics-exporter"}" diff --git a/dev/go_build_operator.sh b/dev/go_build_operator.sh index 7374033a1..f56e37292 100755 --- a/dev/go_build_operator.sh +++ b/dev/go_build_operator.sh @@ -5,7 +5,7 @@ CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" source "${CUR_DIR}/go_build_config.sh" # Build clickhouse-operator -OUTPUT_BINARY="${OPERATOR_BIN:-${SRC_ROOT}/dev/bin/clickhouse-operator}" +OUTPUT_BINARY="${OPERATOR_BIN:-"${SRC_ROOT}/dev/bin/clickhouse-operator"}" MAIN_SRC_FILE="${SRC_ROOT}/cmd/operator/main.go" source "${CUR_DIR}/go_build_universal.sh" diff --git a/dev/go_build_universal.sh b/dev/go_build_universal.sh index 8c3c07b9a..4624cd072 100644 --- a/dev/go_build_universal.sh +++ b/dev/go_build_universal.sh @@ -2,11 +2,6 @@ # Should be called from go_build_operator.sh or go_build_metrics_exporter.sh -# Build clickhouse-operator install .yaml manifest -source "${MANIFESTS_ROOT}/builder/build-clickhouse-operator-configs.sh" -# Build clickhouse-operator install .yaml manifest -source "${MANIFESTS_ROOT}/builder/build-clickhouse-operator-install-yaml.sh" - # Prepare modules if [[ ! -d "${SRC_ROOT}/vendor" ]]; then export GO111MODULE=on diff --git a/dev/image_build_metrics_exporter_altinity.sh b/dev/image_build_metrics_exporter_altinity.sh index 13ab41dde..5a6f8ae89 100755 --- a/dev/image_build_metrics_exporter_altinity.sh +++ b/dev/image_build_metrics_exporter_altinity.sh @@ -8,8 +8,8 @@ CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" source "${CUR_DIR}/go_build_config.sh" # Externally configurable build-dependent options -TAG="${TAG:-latest}" +TAG="${TAG:-"latest"}" DOCKER_IMAGE="altinity/metrics-exporter:${TAG}" -DOCKERHUB_LOGIN="${DOCKERHUB_LOGIN:-altinitybuilds}" +DOCKERHUB_LOGIN="${DOCKERHUB_LOGIN:-"altinitybuilds"}" source "${CUR_DIR}/image_build_metrics_exporter_universal.sh" diff --git a/dev/image_build_metrics_exporter_dev.sh b/dev/image_build_metrics_exporter_dev.sh index 573f0266c..75cff91c0 100755 --- a/dev/image_build_metrics_exporter_dev.sh +++ b/dev/image_build_metrics_exporter_dev.sh @@ -8,7 +8,7 @@ CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" source "${CUR_DIR}/go_build_config.sh" # Externally configurable build-dependent options -TAG="${TAG:-dev}" +TAG="${TAG:-"dev"}" DOCKER_IMAGE="altinity/metrics-exporter:${TAG}" DOCKERHUB_LOGIN="${DOCKERHUB_LOGIN}" diff --git a/dev/image_build_operator_altinity.sh b/dev/image_build_operator_altinity.sh index 2f65195d7..471ba30e4 100755 --- a/dev/image_build_operator_altinity.sh +++ b/dev/image_build_operator_altinity.sh @@ -8,8 +8,8 @@ CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" source "${CUR_DIR}/go_build_config.sh" # Externally configurable build-dependent options -TAG="${TAG:-latest}" +TAG="${TAG:-"latest"}" DOCKER_IMAGE="altinity/clickhouse-operator:${TAG}" -DOCKERHUB_LOGIN="${DOCKERHUB_LOGIN:-altinitybuilds}" +DOCKERHUB_LOGIN="${DOCKERHUB_LOGIN:-"altinitybuilds"}" source "${CUR_DIR}/image_build_operator_universal.sh" diff --git a/dev/image_build_universal.sh b/dev/image_build_universal.sh index b6f429ff5..af36f8909 100644 --- a/dev/image_build_universal.sh +++ b/dev/image_build_universal.sh @@ -7,18 +7,15 @@ set -e DOCKERFILE="${DOCKERFILE_DIR}/Dockerfile" DOCKERHUB_LOGIN="${DOCKERHUB_LOGIN}" -DOCKERHUB_PUBLISH="${DOCKERHUB_PUBLISH:-no}" -MINIKUBE="${MINIKUBE:-no}" +DOCKERHUB_PUBLISH="${DOCKERHUB_PUBLISH:-"no"}" +MINIKUBE="${MINIKUBE:-"no"}" # Source-dependent options CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" SRC_ROOT="$(realpath "${CUR_DIR}/..")" source "${CUR_DIR}/go_build_config.sh" -# Build clickhouse-operator install .yaml manifest -source "${MANIFESTS_ROOT}/builder/build-clickhouse-operator-configs.sh" -# Build clickhouse-operator install .yaml manifest -source "${MANIFESTS_ROOT}/builder/build-clickhouse-operator-install-yaml.sh" +source "${CUR_DIR}/build_manifests.sh" # Build image with Docker if [[ "${MINIKUBE}" == "yes" ]]; then @@ -31,27 +28,47 @@ ARCHITECTURE=$(uname -m) # We may need to install qemu if [[ ! "${ARCHITECTURE}" =~ "arm" ]]; then - if ! docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; then + if docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; then + echo "qemu is in place, continue." + else + echo "qemu is not available, nee to install." sudo apt-get install -y qemu binfmt-support qemu-user-static - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + if docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; then + echo "qemu installed and available, continue." + else + echo "qemu is not installed and not available." + echo "Abort." + exit 1 + fi fi fi if [[ "0" == $(docker buildx ls | grep -E 'linux/arm.+\*' | grep -E 'running|inactive') ]]; then + echo "Looks like there is no appropriate builderx instance available." + echo "Create a new builder instance." docker buildx create --use --name multi-platform --platform=linux/amd64,linux/arm64 +else + echo "Looks like there is an appropriate builderx instance available." fi # # Build docker command # +# Base docker build command DOCKER_CMD="docker buildx build --progress plain" + + +# Append arch if [[ "${DOCKER_IMAGE}" =~ ":dev" || "${MINIKUBE}" == "yes" ]]; then - DOCKER_CMD="${DOCKER_CMD} --output type=image,name=${DOCKER_IMAGE} --platform=linux/amd64" + echo "Building dev images, skip arm arch." + DOCKER_CMD="${DOCKER_CMD} --platform=linux/amd64 --output type=image,name=${DOCKER_IMAGE}" else + echo "Going to build for amd64 and arm64." DOCKER_CMD="${DOCKER_CMD} --platform=linux/amd64,linux/arm64" fi +# Append VERSION and RELEASE DOCKER_CMD="${DOCKER_CMD} --build-arg VERSION=${VERSION:-dev} --build-arg RELEASE=${RELEASE:-1}" # Append GC flags if present @@ -64,8 +81,8 @@ if [[ "${DOCKERHUB_PUBLISH}" == "yes" ]]; then DOCKER_CMD="${DOCKER_CMD} --push" fi -# Finalize docker command -DOCKER_CMD="${DOCKER_CMD} -t ${DOCKER_IMAGE} -f ${DOCKERFILE} ${SRC_ROOT}" +# Append tag, dockerfile and SRC_ROOT +DOCKER_CMD="${DOCKER_CMD} --tag ${DOCKER_IMAGE} --file ${DOCKERFILE} ${SRC_ROOT}" if [[ "${DOCKERHUB_PUBLISH}" == "yes" ]]; then if [[ -n "${DOCKERHUB_LOGIN}" ]]; then @@ -75,8 +92,9 @@ if [[ "${DOCKERHUB_PUBLISH}" == "yes" ]]; then fi if ${DOCKER_CMD}; then - echo "ALL DONE. Docker image published." + echo "OK. Build successful." else - echo "FAILED docker build! Abort." + echo "ERROR. Build has failed." + echo "Abort" exit 1 fi diff --git a/dev/start_new_release_branch.sh b/dev/start_new_release_branch.sh index ad7fb6798..128a47731 100755 --- a/dev/start_new_release_branch.sh +++ b/dev/start_new_release_branch.sh @@ -2,17 +2,65 @@ # Start new release branch + +# +# Increments version represented as x.y.z +# $1: version itself +# $2: number of part: 0 – major, 1 – minor, 2 – patch +# +increment_version() { + local version="${1}" + local what="${2}" + + local delimiter="." + local array=($(echo "${version}" | tr "${delimiter}" '\n')) + + array[${what}]=$((array[${what}]+1)) + if [ ${what} -lt 2 ]; then array[2]=0; fi + if [ ${what} -lt 1 ]; then array[1]=0; fi + echo $(local IFS=${delimiter} ; echo "${array[*]}") +} + # Source configuration CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" source "${CUR_DIR}/go_build_config.sh" CUR_RELEASE=$(cat "${SRC_ROOT}/release") -echo "Starting new release. Current release ${CUR_RELEASE}" +echo "Starting new release." +echo "Current release: ${CUR_RELEASE}" +echo "What would you like to start. Possible options:" +echo " 1 - new major version" +echo " 2 - new minor version" +echo " 3 - new patch version" +echo " x.y.z - in case you'd like to start something completely new just write your preferred version" +echo -n "Enter command choice (1, 2, 3) or custom release (x.y.z): " +read COMMAND +# Trim EOL from the command received +COMMAND=$(echo "${COMMAND}" | tr -d '\n\t\r ') +echo "Provided command is: ${COMMAND}" +echo -n "Which means we are going to " -echo -n "Enter new release: " -read NEW_RELEASE +case "${COMMAND}" in + "1") + NEW_RELEASE=$(increment_version "${CUR_RELEASE}" 0) + echo "start new MAJOR release: ${NEW_RELEASE}" + ;; + "2") + NEW_RELEASE=$(increment_version "${CUR_RELEASE}" 1) + echo "start new MINOR release: ${NEW_RELEASE}" + ;; + "3") + NEW_RELEASE=$(increment_version "${CUR_RELEASE}" 2) + echo "start new PATCH release: ${NEW_RELEASE}" + ;; + *) + NEW_RELEASE="${COMMAND}" + echo "start new CUSTOM release: ${NEW_RELEASE}" + ;; +esac -echo "Starting new release ${NEW_RELEASE}" +read -p "Press enter to start new release" +echo "Starting new release: ${NEW_RELEASE}" # Create release branch git branch "${NEW_RELEASE}" @@ -23,11 +71,13 @@ cat "${SRC_ROOT}/release" "${SRC_ROOT}/releases" > "${SRC_ROOT}/releases_tmp" && echo "${NEW_RELEASE}" > "${SRC_ROOT}/release" # Commit new branch -git add .. -git commit -m "${NEW_RELEASE}" +COMMIT=$(cd "${SRC_ROOT}" && git add . && git commit -m "${NEW_RELEASE}") +echo ${COMMIT} # Some niceness -echo "Releases" +echo "Releases:" cat "${SRC_ROOT}/release" -head -n5 "${SRC_ROOT}/releases" +head -n3 "${SRC_ROOT}/releases" +echo "git status:" +git status diff --git a/dockerfile/metrics-exporter/Dockerfile b/dockerfile/metrics-exporter/Dockerfile index 77d06cbf1..b33595563 100644 --- a/dockerfile/metrics-exporter/Dockerfile +++ b/dockerfile/metrics-exporter/Dockerfile @@ -2,7 +2,7 @@ # ===== Builder ===== # =================== -FROM --platform=${BUILDPLATFORM} golang:1.19 AS builder +FROM --platform=${BUILDPLATFORM} golang:1.20 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/dockerfile/operator/Dockerfile b/dockerfile/operator/Dockerfile index eec31a361..c0347ee27 100644 --- a/dockerfile/operator/Dockerfile +++ b/dockerfile/operator/Dockerfile @@ -2,7 +2,7 @@ # ===== Builder ===== # =================== -FROM --platform=${BUILDPLATFORM} golang:1.19 AS builder +FROM --platform=${BUILDPLATFORM} golang:1.20 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/docs/chi-examples/05-settings-01-overview.yaml b/docs/chi-examples/05-settings-01-overview.yaml index a776c7148..88a61cbdc 100644 --- a/docs/chi-examples/05-settings-01-overview.yaml +++ b/docs/chi-examples/05-settings-01-overview.yaml @@ -6,7 +6,7 @@ type: Opaque stringData: password_plain: password password_sha256_hex: 65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5 - password_double_sha1_hex: 8bd66e4932b4968ec111da24d7e42d399a05cb90bf96f587c3fa191c56c401f8 + password_double_sha1_hex: c5bf7884d77d2294924d6dedcb60222f2730ff04 --- apiVersion: "clickhouse.altinity.com/v1" kind: "ClickHouseInstallation" diff --git a/pkg/model/chi/normalizer.go b/pkg/model/chi/normalizer.go index bbf05e353..8f338d415 100644 --- a/pkg/model/chi/normalizer.go +++ b/pkg/model/chi/normalizer.go @@ -985,7 +985,11 @@ func (n *Normalizer) substSettingsFieldWithDataFromDataSource( } // substSettingsFieldWithSecretFieldValue substitute users settings field with the value read from k8s secret -func (n *Normalizer) substSettingsFieldWithSecretFieldValue(settings SettingsSubstitution, dstField, srcSecretRefField string) bool { +func (n *Normalizer) substSettingsFieldWithSecretFieldValue( + settings SettingsSubstitution, + dstField, + srcSecretRefField string, +) bool { return n.substSettingsFieldWithDataFromDataSource(settings, dstField, srcSecretRefField, true, func(secretAddress api.ObjectAddress) (*api.Setting, error) { secretFieldValue, err := n.fetchSecretFieldValue(secretAddress) @@ -1000,7 +1004,9 @@ func (n *Normalizer) substSettingsFieldWithSecretFieldValue(settings SettingsSub // substSettingsFieldWithEnvRefToSecretField substitute users settings field with ref to ENV var where value from k8s secret is stored in func (n *Normalizer) substSettingsFieldWithEnvRefToSecretField( settings SettingsSubstitution, - dstField, srcSecretRefField, envVarNamePrefix string, + dstField, + srcSecretRefField, + envVarNamePrefix string, parseScalarString bool, ) bool { return n.substSettingsFieldWithDataFromDataSource(settings, dstField, srcSecretRefField, parseScalarString, @@ -1232,25 +1238,25 @@ func (n *Normalizer) removePlainPassword(user *api.SettingsUser) { } const ( - envVarNamePrefixConfigurationUsers = "CONFIGURATION_USERS_VAR_%d" - envVarNamePrefixConfigurationSettings = "CONFIGURATION_SETTINGS_VAR_%d" + envVarNamePrefixConfigurationUsers = "CONFIGURATION_USERS" + envVarNamePrefixConfigurationSettings = "CONFIGURATION_SETTINGS" ) func (n *Normalizer) normalizeConfigurationUser(user *api.SettingsUser) { - i := 1 - user.WalkSafe(func(name string, setting *api.Setting) { + n.normalizeConfigurationUserSecretRef(user) + n.normalizeConfigurationUserPassword(user) + n.normalizeConfigurationUserEnsureMandatoryFields(user) +} + +func (n *Normalizer) normalizeConfigurationUserSecretRef(user *api.SettingsUser) { + user.WalkSafe(func(name string, _ *api.Setting) { if strings.HasPrefix(name, "k8s_secret_") { // TODO remove as obsoleted // Skip this user field, it will be processed later } else { - envVarNamePrefix := fmt.Sprintf(envVarNamePrefixConfigurationUsers, i) - n.substSettingsFieldWithEnvRefToSecretField(user, name, name, envVarNamePrefix, false) - i = i + 1 + n.substSettingsFieldWithEnvRefToSecretField(user, name, name, envVarNamePrefixConfigurationUsers, false) } }) - - n.normalizeConfigurationUserEnsureMandatoryFields(user) - n.normalizeConfigurationUserPassword(user) } func (n *Normalizer) normalizeConfigurationUserEnsureMandatoryFields(user *api.SettingsUser) { @@ -1325,9 +1331,9 @@ func (n *Normalizer) normalizeConfigurationUserPassword(user *api.SettingsUser) n.substSettingsFieldWithSecretFieldValue(user, "password_double_sha1_hex", "k8s_secret_password_double_sha1_hex") // Values from the secret passed via ENV have even higher priority - n.substSettingsFieldWithEnvRefToSecretField(user, "password", "k8s_secret_env_password", user.Username(), true) - n.substSettingsFieldWithEnvRefToSecretField(user, "password_sha256_hex", "k8s_secret_env_password_sha256_hex", user.Username(), true) - n.substSettingsFieldWithEnvRefToSecretField(user, "password_double_sha1_hex", "k8s_secret_env_password_double_sha1_hex", user.Username(), true) + n.substSettingsFieldWithEnvRefToSecretField(user, "password", "k8s_secret_env_password", envVarNamePrefixConfigurationUsers, true) + n.substSettingsFieldWithEnvRefToSecretField(user, "password_sha256_hex", "k8s_secret_env_password_sha256_hex", envVarNamePrefixConfigurationUsers, true) + n.substSettingsFieldWithEnvRefToSecretField(user, "password_double_sha1_hex", "k8s_secret_env_password_double_sha1_hex", envVarNamePrefixConfigurationUsers, true) // Out of all passwords, password_double_sha1_hex has top priority, thus keep it only if user.Has("password_double_sha1_hex") { @@ -1421,11 +1427,8 @@ func (n *Normalizer) normalizeConfigurationSettings(settings *api.Settings) *api } settings.Normalize() - i := 1 settings.WalkSafe(func(name string, setting *api.Setting) { - envVarNamePrefix := fmt.Sprintf(envVarNamePrefixConfigurationSettings, i) - n.substSettingsFieldWithEnvRefToSecretField(settings, name, name, envVarNamePrefix, false) - i = i + 1 + n.substSettingsFieldWithEnvRefToSecretField(settings, name, name, envVarNamePrefixConfigurationSettings, false) }) return settings } diff --git a/release b/release index 610e28725..fda96dcf6 100644 --- a/release +++ b/release @@ -1 +1 @@ -0.23.1 +0.23.2 diff --git a/releases b/releases index a43064501..956496206 100644 --- a/releases +++ b/releases @@ -1,3 +1,4 @@ +0.23.1 0.23.0 0.22.2 0.22.1 diff --git a/tests/e2e/manifests/chi/test-011-secrets.yaml b/tests/e2e/manifests/chi/test-011-secrets.yaml index f92cea64b..234a5c516 100644 --- a/tests/e2e/manifests/chi/test-011-secrets.yaml +++ b/tests/e2e/manifests/chi/test-011-secrets.yaml @@ -22,17 +22,21 @@ spec: user4/k8s_secret_env_password: test-011-secret/pwduser4 # reference the secret using k8s standard syntax + user5/allow_databases/database: + - foo user5/password: valueFrom: secretKeyRef: name: test-011-secret key: pwduser5 + settings: kafka/sasl_username: valueFrom: secretKeyRef: name: test-011-secret key: KAFKA_SASL_USERNAME + kafka/debug: all kafka/sasl_password: valueFrom: secretKeyRef: diff --git a/tests/e2e/test_operator.py b/tests/e2e/test_operator.py index 50bb1fd01..d97106199 100644 --- a/tests/e2e/test_operator.py +++ b/tests/e2e/test_operator.py @@ -900,12 +900,13 @@ def test_011_3(self): assert out == "OK" with And("Connection to localhost should succeed with user5/password defined in valueFrom/secretKeyRef"): - out = clickhouse.query_with_error(chi, "select 'OK'", user="user5", pwd="pwduser5") - assert out == "OK" + out = clickhouse.query_with_error(chi, "select 'OK'", user="user5", pwd="pwduser5") + assert out == "OK" with And("Settings should be securely populated from a secret"): pod = kubectl.get_pod_spec(chi) envs = pod["containers"][0]["env"] + user5_password_env = "" sasl_username_env = "" sasl_password_env = "" for e in envs: @@ -913,11 +914,14 @@ def test_011_3(self): sasl_username_env = e["name"] if e["valueFrom"]["secretKeyRef"]["key"] == "KAFKA_SASL_PASSWORD": sasl_password_env = e["name"] + if e["valueFrom"]["secretKeyRef"]["key"] == "pwduser5": + user5_password_env = e["name"] with By("Secrets are properly propagated to env variables"): - note(f"Found env variables: {sasl_username_env} {sasl_password_env}") + print(f"Found env variables: {sasl_username_env} {sasl_password_env} {user5_password_env}") assert sasl_username_env != "" assert sasl_password_env != "" + assert user5_password_env != "" with By("Secrets are properly referenced from settings.xml"): cfm = kubectl.get("configmap", f"chi-{chi}-common-configd") @@ -925,6 +929,14 @@ def test_011_3(self): assert f"sasl_username from_env=\"{sasl_username_env}\"" in settings_xml assert f"sasl_password from_env=\"{sasl_password_env}\"" in settings_xml + with By("Secrets are properly referenced from users.xml"): + cfm = kubectl.get("configmap", f"chi-{chi}-common-usersd") + users_xml = cfm["data"]["chop-generated-users.xml"] + env_matches = [from_env.strip() for from_env in users_xml.splitlines() if "from_env" in from_env] + print(f"Found env substitutions: {env_matches}") + time.sleep(5) + assert f"password from_env=\"{user5_password_env}\"" in users_xml + kubectl.delete_chi(chi) kubectl.launch( "delete secret test-011-secret",