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.

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

Support Kubernetes v1.22 #85

Merged
merged 14 commits into from Jan 11, 2022
Merged

Support Kubernetes v1.22 #85

merged 14 commits into from Jan 11, 2022

Conversation

@project-bot project-bot bot added this to To do in Development Dec 14, 2021
HELM_DOCS_VERSION = 1.5.0

export ENVTEST_K8S_VERSION
ENVTEST_K8S_VERSION = 1.22.1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Using Kubernetes 1.22.1 with envtest because envtest doesn't provide 1.22.4.

$ ./bin/setup-envtest list
(installed)  v1.22.1  linux/amd64
(available)  v1.22.1  linux/amd64
(available)  v1.22.0  linux/amd64
(available)  v1.21.4  linux/amd64
(available)  v1.21.2  linux/amd64
(available)  v1.20.2  linux/amd64
(available)  v1.19.2  linux/amd64
(available)  v1.19.0  linux/amd64
(available)  v1.17.9  linux/amd64
(available)  v1.16.4  linux/amd64
(available)  v1.15.5  linux/amd64
(available)  v1.14.1  linux/amd64
(available)  v1.13.1  linux/amd64
(available)  v1.12.3  linux/amd64
(available)  v1.11.0  linux/amd64
(available)  v1.10.1  linux/amd64

e2e/Makefile Outdated
KUBE_PROMETHEUS_VERSION := 0.8.0
TOPOLVM_VERSION := 3f3854c808df5d68f46ba316e96bfe6bb7edcd48
KUBE_PROMETHEUS_VERSION := 0.9.0
TOPOLVM_VERSION := 7c269d04b0b8ac8569c8c76c69569a8f9a0b92a8
Copy link
Contributor Author

Choose a reason for hiding this comment

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

7c269d04b0b8ac8569c8c76c69569a8f9a0b92a8 -> https://github.com/topolvm/topolvm/tree/v0.10.3

Copy link
Contributor

Choose a reason for hiding this comment

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

How about simply specifying v0.13.0 instead of commit hash?

@bells17 bells17 marked this pull request as ready for review December 14, 2021 14:47
@bells17 bells17 changed the title Support k8s 1.22 Support Kubernetes v1.22 Dec 14, 2021
@toshipp toshipp moved this from To do to Review in progress in Development Dec 15, 2021
@toshipp toshipp requested review from a team, daichimukai and satoru-takeuchi and removed request for toshipp, llamerada-jp and a team December 15, 2021 05:05
README.md Outdated Show resolved Hide resolved
pvc-autoresizer depends on some Kubernetes repositories like `k8s.io/client-go` and should support 3 consecutive Kubernets versions at a time.
Here is the guide for how to upgrade the supported versions.
Issues and PRs related to the last upgrade task also help you understand how to upgrade the supported versions,
so checking them together with this guide is recommended when you do this task.
Copy link
Member

Choose a reason for hiding this comment

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

How about adding the link to this PR?

#85

docs/maintenance.md Outdated Show resolved Hide resolved
-------------------------------------------

pvc-autoresizer depends on some Kubernetes repositories like `k8s.io/client-go` and should support 3 consecutive Kubernets versions at a time.
Here is the guide for how to upgrade the supported versions.
Copy link
Member

Choose a reason for hiding this comment

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

This line is not necessary because it's clear that this section is for changing the supported Kubernetes versions by the section title.

Maintenance guide
=================

This is the maintenance guide for pvc-autoresizer.
Copy link
Member

Choose a reason for hiding this comment

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

This line is not necessary because it's clear that this document is for maintenance by the document title.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

docs/maintenance.md Outdated Show resolved Hide resolved
- `e2e/Makefile`: Makefile for running e2e tests

`git grep 1.18`, `git grep image:`, and `git grep -i VERSION` might help us avoid overlooking necessary changes.
Please update the versions in the code and docs with great care.
Copy link
Member

Choose a reason for hiding this comment

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

This line is not necesssary.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

### Update dependencies

Next, we should update `go.mod` by the following commands.
Please note that Kubernetes v1 corresponds with v0 for the release tags. For example, v1.17.2 corresponds with the `v0.17.2` tag.
Copy link
Member

Choose a reason for hiding this comment

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

How about "If the new kubernetes version is v1.x.y", the new pvc-autoresizer's version will be v0.x.y"? In addition, it's better to place this line after the following command lines.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

docs/maintenance.md Outdated Show resolved Hide resolved

### Prepare for the next upgrade

We should create an issue for the next upgrade. Besides, Please update this document if we find something to be updated.
Copy link
Member

Choose a reason for hiding this comment

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

Does it mean the next to the next version? In other words, does the new issue for v1.24 if the new supported version is v1.23?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think so. This text is based on Topolvm maintenance.md.

docs/maintenance.md Outdated Show resolved Hide resolved
e2e/Makefile Outdated
KUBE_PROMETHEUS_VERSION := 0.8.0
TOPOLVM_VERSION := 3f3854c808df5d68f46ba316e96bfe6bb7edcd48
KUBE_PROMETHEUS_VERSION := 0.9.0
TOPOLVM_VERSION := 7c269d04b0b8ac8569c8c76c69569a8f9a0b92a8
Copy link
Contributor

Choose a reason for hiding this comment

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

How about simply specifying v0.13.0 instead of commit hash?

@@ -5,14 +5,14 @@ go 1.16
require (
github.com/go-logr/logr v0.4.0
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/onsi/gomega v1.17.0
Copy link
Contributor

Choose a reason for hiding this comment

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

How did you choose this version? I checked go.mod of csi-test following maintenance.md, and found csi-test is using ginkgo v1.14.2 and gomega v1.10.4. Or just updating to latest release is enough for this time?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The pvc-autoscaler isn't a CSI driver, so the pvc-autoscaler doesn't need dependent on the csi-test. So I maybe chose the latest release for ginkgo and gomega.

Copy link
Contributor

Choose a reason for hiding this comment

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

That means this instruction is not true for pvc-autoresizer? Or are there other version indications of ginkgo/gomega elsewhere other than go.mod?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That means this instruction is not true for pvc-autoresizer?

Yes, sorry.
I'll remove this section.

Copy link
Contributor

Choose a reason for hiding this comment

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

No need to apologize :) Thank you fixing.

bells17 and others added 11 commits January 8, 2022 16:58
Co-authored-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
Co-authored-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
Co-authored-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
Co-authored-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
Co-authored-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
Co-authored-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
Co-authored-by: Daichi Mukai <daichi-mukai@cybozu.co.jp>
Co-authored-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
Co-authored-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
@bells17
Copy link
Contributor Author

bells17 commented Jan 8, 2022

@satoru-takeuchi @daichimukai Thank you for your review. It was late, but I updated this PR. Would you review this PR again?

@daichimukai daichimukai merged commit 6fcc42d into main Jan 11, 2022
Development automation moved this from Review in progress to Done Jan 11, 2022
@daichimukai daichimukai deleted the support-k8s-1.22 branch January 11, 2022 05:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development
  
Done
Development

Successfully merging this pull request may close these issues.

Update dependencies add a maintenance document
3 participants