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

Jump to bottom

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

merged 3 commits into from
Feb 12, 2024

Conversation

orginux
Copy link
Contributor

@orginux orginux commented Feb 8, 2024

Signed-off-by: Denis Gorobets orginux@protonmail.com

Important items to consider before making a Pull Request

Please check items PR complies to:

  • All commits in the PR are squashed. More info
  • The PR is made into dedicated next-release branch, not into master branch1. More info
  • The PR is signed. More info

--

1 If you feel your PR does not affect any Go-code or any testable functionality (for example, PR contains docs only or supplementary materials), PR can be made into master branch, but it has to be confirmed by project's maintainer.

@Slach
Copy link
Collaborator

Slach commented Feb 9, 2024

just search and replace version in yaml files is not enough, it could break something like test which use

some files shall to be excluded

Slach
Slach requested changes Feb 9, 2024
View reviewed changes
Copy link
Collaborator

@Slach Slach left a comment

Choose a reason for hiding this comment

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

please rollback changes in some files and use properly versions in some other

tests/e2e/manifests/chi/test-017-multi-version.yaml Outdated
@@ -9,12 +9,12 @@ 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.

23.3 shall be here

tests/e2e/manifests/chi/test-006-ch-upgrade-3.yaml Outdated
@@ -9,7 +9,7 @@ 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.

23.3 shall be here

tests/e2e/manifests/chi/test-006-ch-upgrade-1.yaml Outdated
@@ -9,7 +9,7 @@ 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.

23.3 here

docs/chi-examples/evolution/04-update-introduce-canary.yaml Outdated
@@ -35,7 +35,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:21.8
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.

23.3 here

docs/chi-examples/06-advanced-layout-04-multiple-clusters.yaml Outdated
@@ -48,16 +48,16 @@ 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.

22.8 here

tests/e2e/manifests/chit/tpl-clickhouse-22.2.yaml Outdated
@@ -13,4 +13,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.

rollback it

tests/e2e/manifests/chit/tpl-clickhouse-22.3.yaml Outdated
@@ -13,4 +13,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.

rollback it

tests/e2e/manifests/chit/tpl-clickhouse-22.6.yaml Outdated
@@ -13,5 +13,5 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.6
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.

rollback it

tests/e2e/manifests/chit/tpl-clickhouse-22.7.yaml Outdated
@@ -13,5 +13,5 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.7
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.

rollback it

tests/e2e/manifests/chit/tpl-clickhouse-22.8.yaml Outdated
@@ -13,5 +13,5 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.8
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.

rollback it

Copy link
Collaborator

Choose a reason for hiding this comment

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

add separate tpl-clickhouse-23.8.yaml

and look references to tpl in tests

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As far as I can see the file is already present: https://github.com/Altinity/clickhouse-operator/blob/master/tests/e2e/manifests/chit/tpl-clickhouse-23.8.yaml

Slach
Slach requested changes Feb 9, 2024
View reviewed changes
Copy link
Collaborator

@Slach Slach left a comment

Choose a reason for hiding this comment

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

please sync template images with templates names and link to these template names in other parts of manifests

docs/chi-examples/06-advanced-layout-02-shards.yaml
@@ -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

docs/chi-examples/06-advanced-layout-03-replicas.yaml
@@ -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

docs/chi-examples/08-clickhouse-version-update-01-initial-position.yaml
@@ -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

docs/chi-examples/08-clickhouse-version-update-03-apply-update-all.yaml
@@ -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

docs/chi-examples/04-replication-zookeeper-05-simple-PV.yaml
@@ -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

docs/chi-examples/99-clickhouseinstallation-max.yaml
@@ -569,7 +569,7 @@ spec:
spec:
containers:
- name: clickhouse
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.

look above to template name line 489, sync it

docs/chi-examples/99-clickhouseinstallation-max.yaml
@@ -599,7 +599,7 @@ spec:
spec:
containers:
- name: clickhouse
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.

change template name in line 593 and find usages of this template

docs/custom_resource_explained.md
@@ -561,7 +561,7 @@ with additional sections, such as:
spec:
containers:
- name: clickhouse
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 description in line 543 and 542 with actual clickhouse version

docs/replication_setup.md
@@ -48,7 +48,7 @@ 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 with name in line 47 and find usages this template and change template name reference too

tests/e2e/manifests/chi/test-022-broken-image.yaml
@@ -12,7 +12,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.8-broken
image: clickhouse/clickhouse-server:23.8-broken
Copy link
Collaborator

Choose a reason for hiding this comment

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

sync with line 11 and 8

@alex-zaitsev alex-zaitsev merged commit a651338 into Altinity:0.23.1 Feb 12, 2024
alex-zaitsev added a commit that referenced this pull request Feb 12, 2024
@alex-zaitsev
Continuation of #1338. Fix version in docs.
a1843ca
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Slach Slach Slach requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@orginux @Slach @alex-zaitsev