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

Update kubernetes sources for 1.23, 1.24, 1.25 and 1.26 #28

Merged
merged 5 commits into from
Jul 11, 2024

Conversation

arnaldo2792
Copy link
Contributor

@arnaldo2792 arnaldo2792 commented Jul 10, 2024

Issue number:

N / A

Description of changes:

This updates the kubernetes sources of the versions that reached their EOL in upstream kubernetes but are in extended support in EKS Distro.

As part of this change, we migrated back to upstream kubernetes for 1.23, 1.24, 1.25 and 1.26 and applied all the patches provided by EKS Distro. With the previous sources, the patches failed to be applied.

Testing done:

Launched 4 nodes, one of each kubernetes version. All joined the cluster and pods are running. I confirmed the versions reported match the new versions

kubernetes-updates on Fedora ❯ k get nodes
NAME                                           STATUS   ROLES    AGE   VERSION
ip-xxxx.us-west-2.compute.internal             Ready    <none>   15m   v1.23.17
ip-xxxx.us-west-2.compute.internal             Ready    <none>   15m   v1.24.17
ip-xxxx.us-west-2.compute.internal             Ready    <none>   15m   v1.25.16
ip-xxxx.us-west-2.compute.internal             Ready    <none>   15m   v1.26.15
kubernetes-updates on Fedora ❯ k get pods
NAME           READY   STATUS    RESTARTS   AGE
fedora-8tx8k   1/1     Running   0          24s
fedora-bggg4   1/1     Running   0          24s
fedora-p29c7   1/1     Running   0          24s
fedora-xggnk   1/1     Running   0          24s
kubernetes-updates on Fedora ❯

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Patch0003: 0028-EKS-PATCH-bump-golang.org-x-net-to-v0.17.patch
Patch0004: 0029-EKS-PATCH-Add-ephemeralcontainer-to-imagepolicy-secu.patch
Patch0005: 0030-EKS-PATCH-go-Bump-images-dependencies-and-versions-t.patch

Copy link
Contributor

Choose a reason for hiding this comment

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

nit: I think this line isn't needed.

Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
@arnaldo2792
Copy link
Contributor Author

(Forced push includes rebase and bump in corekit version)

Copy link
Contributor

@ginglis13 ginglis13 left a comment

Choose a reason for hiding this comment

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

LGTM after testing succeeds

@arnaldo2792 arnaldo2792 marked this pull request as ready for review July 10, 2024 23:27
@arnaldo2792 arnaldo2792 merged commit b92be0f into bottlerocket-os:develop Jul 11, 2024
2 checks passed
@arnaldo2792 arnaldo2792 deleted the update-k8s branch September 5, 2024 17:57
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.

3 participants