Skip to content

Commit 7bbe4cf

Browse files
committed
Merge branch '0.25.6' of github.com:Altinity/clickhouse-operator into improve-prometheus-rules
2 parents 5868d44 + f1dd655 commit 7bbe4cf

File tree

44 files changed

+486
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+486
-302
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,7 @@ tests/image/cache
5151
/.devspace
5252

5353
# agents
54-
.aider*
54+
.aider*
55+
CLAUDE.md
56+
AGENTS.md
57+
.claude

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,14 +237,17 @@ spec:
237237
normalized:
238238
type: object
239239
description: "Normalized resource requested"
240+
nullable: true
240241
x-kubernetes-preserve-unknown-fields: true
241242
normalizedCompleted:
242243
type: object
243244
description: "Normalized resource completed"
245+
nullable: true
244246
x-kubernetes-preserve-unknown-fields: true
245247
actionPlan:
246248
type: object
247249
description: "Action Plan"
250+
nullable: true
248251
x-kubernetes-preserve-unknown-fields: true
249252
hostsWithTablesCreated:
250253
type: array

deploy/helm/clickhouse-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ description: |-
1313
kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml
1414
```
1515
type: application
16-
version: 0.25.5
17-
appVersion: 0.25.5
16+
version: 0.25.6
17+
appVersion: 0.25.6
1818
home: https://github.com/Altinity/clickhouse-operator
1919
icon: https://logosandtypes.com/wp-content/uploads/2020/12/altinity.svg
2020
maintainers:

deploy/helm/clickhouse-operator/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# altinity-clickhouse-operator
22

3-
![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)
3+
![Version: 0.25.6](https://img.shields.io/badge/Version-0.25.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.25.6](https://img.shields.io/badge/AppVersion-0.25.6-informational?style=flat-square)
44

55
Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).
66

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
# SINGULAR=clickhouseinstallation
55
# PLURAL=clickhouseinstallations
66
# SHORT=chi
7-
# OPERATOR_VERSION=0.25.5
7+
# OPERATOR_VERSION=0.25.6
88
#
99
apiVersion: apiextensions.k8s.io/v1
1010
kind: CustomResourceDefinition
1111
metadata:
1212
name: clickhouseinstallations.clickhouse.altinity.com
1313
labels:
14-
clickhouse.altinity.com/chop: 0.25.5
14+
clickhouse.altinity.com/chop: 0.25.6
1515
spec:
1616
group: clickhouse.altinity.com
1717
scope: Namespaced
@@ -237,14 +237,17 @@ spec:
237237
normalized:
238238
type: object
239239
description: "Normalized resource requested"
240+
nullable: true
240241
x-kubernetes-preserve-unknown-fields: true
241242
normalizedCompleted:
242243
type: object
243244
description: "Normalized resource completed"
245+
nullable: true
244246
x-kubernetes-preserve-unknown-fields: true
245247
actionPlan:
246248
type: object
247249
description: "Action Plan"
250+
nullable: true
248251
x-kubernetes-preserve-unknown-fields: true
249252
hostsWithTablesCreated:
250253
type: array

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
# SINGULAR=clickhouseinstallationtemplate
55
# PLURAL=clickhouseinstallationtemplates
66
# SHORT=chit
7-
# OPERATOR_VERSION=0.25.5
7+
# OPERATOR_VERSION=0.25.6
88
#
99
apiVersion: apiextensions.k8s.io/v1
1010
kind: CustomResourceDefinition
1111
metadata:
1212
name: clickhouseinstallationtemplates.clickhouse.altinity.com
1313
labels:
14-
clickhouse.altinity.com/chop: 0.25.5
14+
clickhouse.altinity.com/chop: 0.25.6
1515
spec:
1616
group: clickhouse.altinity.com
1717
scope: Namespaced
@@ -237,14 +237,17 @@ spec:
237237
normalized:
238238
type: object
239239
description: "Normalized resource requested"
240+
nullable: true
240241
x-kubernetes-preserve-unknown-fields: true
241242
normalizedCompleted:
242243
type: object
243244
description: "Normalized resource completed"
245+
nullable: true
244246
x-kubernetes-preserve-unknown-fields: true
245247
actionPlan:
246248
type: object
247249
description: "Action Plan"
250+
nullable: true
248251
x-kubernetes-preserve-unknown-fields: true
249252
hostsWithTablesCreated:
250253
type: array

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Template Parameters:
22
#
3-
# OPERATOR_VERSION=0.25.5
3+
# OPERATOR_VERSION=0.25.6
44
#
55
apiVersion: apiextensions.k8s.io/v1
66
kind: CustomResourceDefinition
77
metadata:
88
name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com
99
labels:
10-
clickhouse-keeper.altinity.com/chop: 0.25.5
10+
clickhouse-keeper.altinity.com/chop: 0.25.6
1111
spec:
1212
group: clickhouse-keeper.altinity.com
1313
scope: Namespaced

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ kind: CustomResourceDefinition
77
metadata:
88
name: clickhouseoperatorconfigurations.clickhouse.altinity.com
99
labels:
10-
clickhouse.altinity.com/chop: 0.25.5
10+
clickhouse.altinity.com/chop: 0.25.6
1111
spec:
1212
group: clickhouse.altinity.com
1313
scope: Namespaced

deploy/helm/clickhouse-operator/templates/generated/Deployment-clickhouse-operator.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#
33
# NAMESPACE=kube-system
44
# COMMENT=
5-
# OPERATOR_IMAGE=altinity/clickhouse-operator:0.25.5
5+
# OPERATOR_IMAGE=altinity/clickhouse-operator:0.25.6
66
# OPERATOR_IMAGE_PULL_POLICY=Always
7-
# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.25.5
7+
# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.25.6
88
# METRICS_EXPORTER_IMAGE_PULL_POLICY=Always
99
#
1010
# Setup Deployment for clickhouse-operator

deploy/helm/clickhouse-operator/templates/generated/Secret-clickhouse-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Template parameters available:
44
# NAMESPACE=kube-system
55
# COMMENT=
6-
# OPERATOR_VERSION=0.25.5
6+
# OPERATOR_VERSION=0.25.6
77
# CH_USERNAME_SECRET_PLAIN=clickhouse_operator
88
# CH_PASSWORD_SECRET_PLAIN=clickhouse_operator_password
99
#

0 commit comments

Comments
 (0)