Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade ClickHouse version to 23.8-lts #1338

Merged
merged 3 commits into from
Feb 12, 2024
Merged

Upgrade ClickHouse version to 23.8-lts #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c59e70
upgrade ch version
orginux Feb 8, 2024
5402be0
rollback some changes
orginux Feb 9, 2024
8a4fb2e
rollback some changes
orginux Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/templates.d/001-templates.json.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"containers" : [
{
"name": "clickhouse",
"image": "clickhouse/clickhouse-server:22.3",
"image": "clickhouse/clickhouse-server:23.8",
"ports": [
{
"name": "http",
Expand Down
2 changes: 1 addition & 1 deletion deploy/builder/templates-config/templates.d/001-templates.json.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"containers" : [
{
"name": "clickhouse",
"image": "clickhouse/clickhouse-server:22.3",
"image": "clickhouse/clickhouse-server:23.8",
"ports": [
{
"name": "http",
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ configs:
"containers" : [
{
"name": "clickhouse",
"image": "clickhouse/clickhouse-server:22.3",
"image": "clickhouse/clickhouse-server:23.8",
"ports": [
{
"name": "http",
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator/clickhouse-operator-install-ansible.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3917,7 +3917,7 @@ data:
"containers" : [
{
"name": "clickhouse",
"image": "clickhouse/clickhouse-server:22.3",
"image": "clickhouse/clickhouse-server:23.8",
"ports": [
{
"name": "http",
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3860,7 +3860,7 @@ data:
"containers" : [
{
"name": "clickhouse",
"image": "clickhouse/clickhouse-server:22.3",
"image": "clickhouse/clickhouse-server:23.8",
"ports": [
{
"name": "http",
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator/clickhouse-operator-install-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3910,7 +3910,7 @@ data:
"containers" : [
{
"name": "clickhouse",
"image": "clickhouse/clickhouse-server:22.3",
"image": "clickhouse/clickhouse-server:23.8",
"ports": [
{
"name": "http",
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator/clickhouse-operator-install-template-v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3860,7 +3860,7 @@ data:
"containers" : [
{
"name": "clickhouse",
"image": "clickhouse/clickhouse-server:22.3",
"image": "clickhouse/clickhouse-server:23.8",
"ports": [
{
"name": "http",
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator/clickhouse-operator-install-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3910,7 +3910,7 @@ data:
"containers" : [
{
"name": "clickhouse",
"image": "clickhouse/clickhouse-server:22.3",
"image": "clickhouse/clickhouse-server:23.8",
"ports": [
{
"name": "http",
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator/clickhouse-operator-install-tf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3917,7 +3917,7 @@ data:
"containers" : [
{
"name": "clickhouse",
"image": "clickhouse/clickhouse-server:22.3",
"image": "clickhouse/clickhouse-server:23.8",
"ports": [
{
"name": "http",
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/02-templates-01-pod-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
# Container has explicitly specified resource requests
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/02-templates-04-host-template-volume-claim-and-pod-resources-limit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: clickhouse-data-storage
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/02-templates-05-sidecar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
containers:
# Main container
- name: clickhouse
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: sidecar-configmap-volume
mountPath: /configmap-volume
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/02-templates-06-bootstrap-schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: bootstrap-configmap-volume
mountPath: /docker-entrypoint-initdb.d
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/03-persistent-volume-02-pod-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: data-storage-vc-template
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/03-persistent-volume-03-custom-labels-and-annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: data-storage-vc-template
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/03-persistent-volume-07-multiple-resizable-volumes-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: data-storage-vc-template-1
mountPath: /data/clickhouse-01
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/03-persistent-volume-07-multiple-resizable-volumes-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: data-storage-vc-template-1
mountPath: /data/clickhouse-01
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/03-persistent-volume-07-multiple-resizable-volumes-3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: data-storage-vc-template-1
mountPath: /data/clickhouse-01
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/03-persistent-volume-07-security-context.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
add: [ "CAP_NICE", "CAP_IPC_LOCK" ]
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
imagePullPolicy: IfNotPresent
volumeMounts:
- name: data-storage-vc-template-1
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/04-replication-zookeeper-03-minimal-AWS-persistent-volume.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: clickhouse-storage-template
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/04-replication-zookeeper-04-medium-AWS-persistent-volume.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: clickhouse-storage-template
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/04-replication-zookeeper-05-simple-PV.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync podTemplates name and look to usage changed template name in spec default line 11

4 changes: 2 additions & 2 deletions docs/chi-examples/06-advanced-layout-01-one-shard-many-replicas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.1
image: clickhouse/clickhouse-server:23.8
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync template name with and ferenece to template name in line 13 and line 20 above


- name: clickhouse:nonexist
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.122
image: clickhouse/clickhouse-server:23.822
6 changes: 3 additions & 3 deletions docs/chi-examples/06-advanced-layout-02-shards.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.1
image: clickhouse/clickhouse-server:22.8

- name: clickhouse:22.2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync version with template names in this file

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync names in line 23, 18, 13 above

spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.2
image: clickhouse/clickhouse-server:23.3


- name: clickhouse:22.3
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
6 changes: 3 additions & 3 deletions docs/chi-examples/06-advanced-layout-03-replicas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.1
image: clickhouse/clickhouse-server:22.8
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync version with name in podTemplates, look line 23, 18, 13


- name: clickhouse:22.3
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.2
image: clickhouse/clickhouse-server:23.3


- name: clickhouse:22.3
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
6 changes: 3 additions & 3 deletions docs/chi-examples/06-advanced-layout-04-multiple-clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.1
image: clickhouse/clickhouse-server:22.8

- name: t2
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.2
image: clickhouse/clickhouse-server:23.3

- name: t3
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
2 changes: 1 addition & 1 deletion docs/chi-examples/08-clickhouse-version-update-01-initial-position.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.2
image: clickhouse/clickhouse-server:23.8
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync version with podTemplates name, line 10 and line 20

4 changes: 2 additions & 2 deletions docs/chi-examples/08-clickhouse-version-update-02-apply-update-one.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.2
image: clickhouse/clickhouse-server:23.8
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync podTemplate name nad reference in line 22, 18,10, 28


- name: clickhouse:22.3
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
2 changes: 1 addition & 1 deletion docs/chi-examples/08-clickhouse-version-update-03-apply-update-all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync version with PodTemplates name

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

look also usage of this podTemplate above in the same file

2 changes: 1 addition & 1 deletion docs/chi-examples/09-rolling-update-emptydir-01-initial-position.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: clickhouse-storage
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/09-rolling-update-emptydir-02-apply-update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: clickhouse-storage
mountPath: /var/lib/clickhouse
Expand Down
4 changes: 2 additions & 2 deletions docs/chi-examples/10-zones-01-simple-01-aws-pods-in-availability-zones.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8

- name: clickhouse-in-zone-us-east-1b
zone:
Expand All @@ -58,4 +58,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
2 changes: 1 addition & 1 deletion docs/chi-examples/10-zones-01-simple-02-aws-pod-per-host.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
4 changes: 2 additions & 2 deletions docs/chi-examples/10-zones-02-advanced-01-aws-pods-in-availability-zones.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spec:
- "us-east-1a"
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8

- name: clickhouse-in-zone-us-east-1b
spec:
Expand All @@ -72,4 +72,4 @@ spec:
- "us-east-1b"
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
2 changes: 1 addition & 1 deletion docs/chi-examples/10-zones-02-advanced-02-aws-pod-per-host.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ spec:
topologyKey: "kubernetes.io/hostname"
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
2 changes: 1 addition & 1 deletion docs/chi-examples/10-zones-03-advanced-03-pod-per-host-default-storage-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
topologyKey: "kubernetes.io/hostname"
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: storage-vc-template
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/10-zones-04-advanced-04-pod-per-host-local-storage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
type: DirectoryOrCreate
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
- name: local-path
mountPath: /var/lib/clickhouse
2 changes: 1 addition & 1 deletion docs/chi-examples/11-local-storage-01-simple-host-path.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
type: DirectoryOrCreate
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
# Specify reference to volume on local filesystem
- name: local-path
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/11-local-storage-02-advanced-host-path.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
type: DirectoryOrCreate
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
volumeMounts:
# Specify reference to volume on local filesystem
- name: local-path
Expand Down
2 changes: 1 addition & 1 deletion docs/chi-examples/12-troubleshooting-01.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:22.3
image: clickhouse/clickhouse-server:23.8
command:
- "/bin/bash"
- "-c"
Expand Down
Loading