Skip to content

Commit d22d63c

Browse files
committed
Merge branch '0.25.6' of github.com:Altinity/clickhouse-operator into tests_refactoring
Signed-off-by: Slach <[email protected]> # Conflicts: # go.mod # tests/e2e/run_tests_operator.sh # tests/e2e/test_operator.py # tests/regression.py
2 parents 9ef732c + 8e6f299 commit d22d63c

File tree

58 files changed

+698
-462
lines changed

Some content is hidden

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

58 files changed

+698
-462
lines changed

.github/workflows/release_chart.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ jobs:
2525
sudo install cr /usr/local/bin/
2626
rm -f cr chart-releaser_1.4.1_linux_amd64.tar.gz
2727
28+
- name: Install Helm
29+
run: |
30+
curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
31+
32+
- name: Login to GitHub Container Registry
33+
run: echo "${{ secrets.GITHUB_TOKEN }}" | helm registry login ghcr.io -u ${{ github.actor }} --password-stdin
34+
2835
- name: Package Chart
2936
run: cr package deploy/helm/clickhouse-operator
3037

@@ -73,6 +80,11 @@ jobs:
7380
echo " HELM_GITHUB_REPOSITORY: ${{ vars.HELM_GITHUB_REPOSITORY }}"
7481
echo " HELM_GITHUB_TOKEN: [SET]"
7582
83+
- name: Push Helm Chart to OCI Registry
84+
run: |
85+
CHART_PATH=$(ls .cr-release-packages/altinity-clickhouse-operator-*.tgz)
86+
helm push "${CHART_PATH}" oci://ghcr.io/altinity/clickhouse-operator-helm-chart
87+
7688
- name: Upload Release Artifacts to Helm Repo
7789
run: |
7890
cr upload \

.github/workflows/run_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
with:
4848
driver: docker
4949
container-runtime: containerd
50-
kubernetes-version: v1.31.2
50+
kubernetes-version: v1.33.5
5151
cpus: max
5252
memory: max
5353

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,7 @@ tests/*.html
5353
/.devspace
5454

5555
# agents
56-
.aider*
56+
.aider*
57+
CLAUDE.md
58+
AGENTS.md
59+
.claude

config/config-dev.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ clickhouse:
123123
# these settings should not lead to pod restarts
124124
- settings/display_secrets_in_show_and_select: "no"
125125

126-
- zookeeper/*: "yes"
126+
- zookeeper/*: "no"
127127

128128
- files/*.xml: "yes"
129129
- files/config.d/*.xml: "yes"
@@ -455,8 +455,8 @@ status:
455455
fields:
456456
action: false
457457
actions: false
458-
error: false
459-
errors: false
458+
error: true
459+
errors: true
460460

461461
################################################
462462
##

config/config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ clickhouse:
121121
# these settings should not lead to pod restarts
122122
- settings/display_secrets_in_show_and_select: "no"
123123

124-
- zookeeper/*: "yes"
124+
- zookeeper/*: "no"
125125

126126
- files/*.xml: "yes"
127127
- files/config.d/*.xml: "yes"
@@ -453,8 +453,8 @@ status:
453453
fields:
454454
action: false
455455
actions: false
456-
error: false
457-
errors: false
456+
error: true
457+
errors: true
458458

459459
################################################
460460
##

deploy/builder/templates-config/config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ clickhouse:
115115
# these settings should not lead to pod restarts
116116
- settings/display_secrets_in_show_and_select: "no"
117117

118-
- zookeeper/*: "yes"
118+
- zookeeper/*: "no"
119119

120120
- files/*.xml: "yes"
121121
- files/config.d/*.xml: "yes"
@@ -447,8 +447,8 @@ status:
447447
fields:
448448
action: false
449449
actions: false
450-
error: false
451-
errors: false
450+
error: true
451+
errors: true
452452

453453
################################################
454454
##

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

0 commit comments

Comments
 (0)