Upgrade k8s dependencies to 1.26.15 #928
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SergeyMelnikov
changed the title
SergeyMelnikov
force-pushed
the
sergey/k8s-1.26.15
branch
2 times, most recently
from
4ed87d2 to
ec153e3
Compare
SergeyMelnikov
changed the title
bayandin
changed the title
SergeyMelnikov
force-pushed
the
sergey/k8s-1.26.15
branch
from
ec153e3 to
7fbc3d0
Compare
SergeyMelnikov
added a commit
that referenced
this pull request
Jun 6, 2024
When upgrading k3d cluster to 1.26 in #928 k3d cluster nodes are getting renamed into `K3s v1.26.15+k3s1` instead of `K3s dev`. We rely on this to find containerd socket in e2e tests, so they breaks. Let's detect if we are running inside k3d cluster using `K3s` prefix.
sharnoff
force-pushed
the
sergey/k8s-1.26.15
branch
from
b1f1ec6 to
ea0118e
Compare
Omrigan
force-pushed
the
sergey/k8s-1.26.15
branch
from
ea0118e to
e149650
Compare
Omrigan
approved these changes
Jun 15, 2024
sharnoff
reviewed
Jun 16, 2024
There was a problem hiding this comment.
Rebased onto main, found some other places that need updating, with rg '1\.25':
- in
kind/config.yaml, thekindest/nodeimage versions - in
Makefile,ENVTEST_K8S_VERSIONandKUBECTL_VERSION - in
neonvm/runner/Dockerfile, crictlVERSION
edit: Actually there's also some with rg '0\.25':
- in
Makefile,CODE_GENERATOR_VERSION
edit: and there's even more, that don't have regular versions:
- in
Makefile,CONTROLLER_TOOLS_VERSION
There's also some docs where the version could be updated, but 🤷
| @@ -42,7 +42,7 @@ $ # create a temporary directory for kubernetes/autoscaler | |||
| $ tmpdir=$(mktemp -d | tee /dev/tty) | |||
| /tmp/tmp./tmp/tmp.MCMXmnprG0 | |||
| $ # clone the source repo | |||
| $ git clone --quiet --branch $(cat cluster-autoscaler/ca.tag) https://github.com/kubernetes/autsocaler $tmpdir | |||
| $ git clone --quiet --branch $(cat cluster-autoscaler/ca.tag) https://github.com/kubernetes/autoscaler $tmpdir | |||
sharnoff
force-pushed
the
sergey/k8s-1.26.15
branch
from
e149650 to
fb017c3
Compare
|
Updates:
Also, triggered e2e tests on kind, here: https://github.com/neondatabase/autoscaling/actions/runs/9539100392 |
sharnoff
approved these changes
Jun 16, 2024
There was a problem hiding this comment.
e2e-kind succeeded: https://github.com/neondatabase/autoscaling/actions/runs/9539279238
Looks all good to me; @SergeyMelnikov & @Omrigan could you double-check my recent changes? fb017c3..7c09c5b
SergeyMelnikov
changed the title
|
Looks good to me, and given all clusters were upgraded, I'm rebasing to main and merging this PR |
SergeyMelnikov
force-pushed
the
sergey/k8s-1.26.15
branch
2 times, most recently
from
09e2172 to
7c09c5b
Compare
Signed-off-by: Oleg Vasilev <[email protected]>
Signed-off-by: Oleg Vasilev <[email protected]>
Signed-off-by: Oleg Vasilev <[email protected]>
Signed-off-by: Oleg Vasilev <[email protected]>
We could have kept kind at v0.20.0 and used nodes v1.26.0, but I figured it's better for consistency to use v1.26.15 in the kind nodes as well.
Genuinely shocked that makefile semantics includes the spaces in the variable, but hey.
maybe we should change it, but that should be a separate PR.
SergeyMelnikov
force-pushed
the
sergey/k8s-1.26.15
branch
from
7c09c5b to
eb4007d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The plan is after all clusters are upgraded to rebase this on top of main and merge.
cc: https://github.com/neondatabase/cloud/issues/7922