Skip to content

Comments

Update Kubernetes to v1.23#4623

Merged
brandond merged 2 commits intok3s-io:masterfrom
brandond:kubernetes_1.23
Dec 22, 2021
Merged

Update Kubernetes to v1.23#4623
brandond merged 2 commits intok3s-io:masterfrom
brandond:kubernetes_1.23

Conversation

@brandond
Copy link
Member

@brandond brandond commented Dec 1, 2021

Proposed Changes

Types of Changes

Upstream version change

Verification

kubectl --version

Linked Issues

User-Facing Change

Move containerd out to separate binary
Update Kubernetes to v1.23.1

Further Comments

@brandond brandond force-pushed the kubernetes_1.23 branch 3 times, most recently from 8367f4b to 88d9070 Compare December 3, 2021 02:47
@dweomer
Copy link
Contributor

dweomer commented Dec 3, 2021

Would like to see the split out of containerd as a separate binary in its own PR (that gets merged before this kind of bump).

@brandond brandond force-pushed the kubernetes_1.23 branch 9 times, most recently from 5da55dd to ac02c3d Compare December 7, 2021 23:23
@brandond brandond marked this pull request as ready for review December 7, 2021 23:26
@brandond brandond requested a review from a team as a code owner December 7, 2021 23:26
@brandond brandond modified the milestone: v1.23.0+k3s1 Dec 7, 2021
Copy link
Member

@dereknola dereknola left a comment

Choose a reason for hiding this comment

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

LGTM

@olljanat
Copy link
Contributor

I understand that separate binary is needed because opentelemetry but is containerd 1.6.0 release really so far that K3s 1.23 versions cannot wait that?

I was hoping that we would be able to solve #4545 on 1.23 and I assume that other RKE2 users would like to see it too.

@brandond
Copy link
Member Author

brandond commented Dec 10, 2021

containerd v1.6.0 isn't out yet; I have no idea what their target date is for releasing that. Even if it did come out today, we would probably be somewhat reluctant to ship a .0 release.

@brandond brandond force-pushed the kubernetes_1.23 branch 3 times, most recently from ea91295 to 644eb2a Compare December 13, 2021 23:26
Copy link
Contributor

@dweomer dweomer left a comment

Choose a reason for hiding this comment

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

  • The k3s-root bump should be in a separate PR. I want to see it as a standalone change in the git log as well as tested end-to-end on its own.
  • The containerd split should be in a separate PR that includes an ADR. As with k3s-root, I want to see it as a standalone change in the git log as well as tested end-to-end on its own.

@brandond
Copy link
Member Author

brandond commented Dec 15, 2021

  • The k3s-root bump should be in a separate PR. I want to see it as a standalone change in the git log as well as tested end-to-end on its own.
  • The containerd split should be in a separate PR that includes an ADR. As with k3s-root, I want to see it as a standalone change in the git log as well as tested end-to-end on its own.

Sorry, I thought based on our conversation in standup the other day that we were OK not doing these separately since no-one else cared to see them split out. I can take a moment to create additional PRs for those, but since they are required to successfully build 1.23, I will also leave those commits here and then rebase on top of the merged versions once they're in.

@brandond brandond force-pushed the kubernetes_1.23 branch 2 times, most recently from e42b46c to dfc606c Compare December 16, 2021 20:25
@brandond brandond requested review from Oats87 and dweomer December 16, 2021 20:25
Copy link
Member

@Oats87 Oats87 left a comment

Choose a reason for hiding this comment

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

LGTM; should we torch the vendor directory ....?

"github.com/google/cadvisor/machine"
"github.com/google/cadvisor/utils/sysfs"
"github.com/sirupsen/logrus"
"k8s.io/component-helpers/node/util/sysctl"
Copy link
Member

Choose a reason for hiding this comment

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

yay for moving packages

# Ignore vendor folder and check file names as well
# Note: ignore "ba" in https://github.com/k3s-io/k3s/blob/4317a91/scripts/provision/vagrant#L54
codespell --skip=.git,./vendor,MAINTAINERS --check-filenames --ignore-words-list=ba
codespell --skip=.git,./vendor,MAINTAINERS,go.mod,go.sum --check-filenames --ignore-words-list=ba
Copy link
Member

Choose a reason for hiding this comment

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

We should definitely make sure to get this into our other branches

Copy link
Contributor

@dweomer dweomer left a comment

Choose a reason for hiding this comment

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

LGTM (assuming the cri-tools mismatch is on purpose and will be dealt with via follow-on PR)

@brandond brandond force-pushed the kubernetes_1.23 branch 13 times, most recently from 0eaa6f3 to 4a63c94 Compare December 21, 2021 02:48
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond merged commit 08d538f into k3s-io:master Dec 22, 2021
@brandond brandond deleted the kubernetes_1.23 branch June 6, 2024 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants