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

Upgrading to k8s v1.29 for distro k3s package #3186

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Upgrading to k8s v1.29 for distro k3s package #3186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20fed84
upgrading to k3s 1.29 for distro package
dgershman Nov 4, 2024
82032f9
Merge branch 'main' into feature/k3s-upgrade
dgershman Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/distros/k3s/zarf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ components:
symlinks:
- /etc/systemd/system/multi-user.target.wants/k3s.service
# Include the actual K3s binary
- source: https://github.com/k3s-io/k3s/releases/download/v1.28.4+k3s2/k3s
shasum: 9014535a4cd20c788282d60398a06279983562093455b53ab76701539ce67acf
- source: https://github.com/k3s-io/k3s/releases/download/v1.29.10+k3s1/k3s
shasum: 5b82d6964ae1720a2cd5a5198a7732636ae6076321d497f5533502e2e488f53f
target: /usr/sbin/k3s
executable: true
# K3s magic provides these tools when symlinking
Expand All @@ -41,8 +41,8 @@ components:
- /usr/sbin/ctr
- /usr/sbin/crictl
# Transfer the K3s images for containerd to pick them up
- source: https://github.com/k3s-io/k3s/releases/download/v1.28.4+k3s2/k3s-airgap-images-amd64.tar.zst
shasum: bc4d05bad56a583c80ff443d60e8277a136cc4357dc8527702d38b5cca28880d
- source: https://github.com/k3s-io/k3s/releases/download/v1.29.10+k3s1/k3s-airgap-images-amd64.tar.zst
shasum: 09e644d380d27a845f5c8028066271cd712d0ac6fcfc283ba44ec532adb2ca6f
target: /var/lib/rancher/k3s/agent/images/k3s.tar.zst
actions:
onDeploy:
Expand Down Expand Up @@ -97,8 +97,8 @@ components:
symlinks:
- /etc/systemd/system/multi-user.target.wants/k3s.service
# Include the actual K3s binary
- source: https://github.com/k3s-io/k3s/releases/download/v1.28.4+k3s2/k3s-arm64
shasum: 1ae72ca06d3302f3e86ef92e6e8f84e14a084da69564e87d6e2e75f62e72388d
- source: https://github.com/k3s-io/k3s/releases/download/v1.29.10+k3s1/k3s-arm64
shasum: 0eccc3ce9bbf40b88c897f6a6293dd6aa97ee59b6f2f69c30e2811608e607757
target: /usr/sbin/k3s
executable: true
# K3s magic provides these tools when symlinking
Expand All @@ -107,8 +107,8 @@ components:
- /usr/sbin/ctr
- /usr/sbin/crictl
# Transfer the K3s images for containerd to pick them up
- source: https://github.com/k3s-io/k3s/releases/download/v1.28.4+k3s2/k3s-airgap-images-arm64.tar.zst
shasum: 50621ae1391aec7fc66ca66a46a0e9fd48ce373a58073000efdc278233adc64b
- source: https://github.com/k3s-io/k3s/releases/download/v1.29.10+k3s1/k3s-airgap-images-arm64.tar.zst
shasum: 18ab57f41a1c497283a2723a27c3ca5b64975c2873e4f0ed0646753fb2bdc60f
target: /var/lib/rancher/k3s/agent/images/k3s.tar.zst
actions:
onDeploy:
Expand Down
2 changes: 1 addition & 1 deletion src/test/e2e/20_zarf_init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func TestZarfInit(t *testing.T) {
// make sure that we upgraded `k3s` correctly and are running the correct version - this should match that found in `packages/distros/k3s`
kubeletVersion, _, err := e2e.Kubectl(t, "get", "nodes", "-o", "jsonpath={.items[0].status.nodeInfo.kubeletVersion}")
require.NoError(t, err)
require.Contains(t, kubeletVersion, "v1.28.4+k3s2")
require.Contains(t, kubeletVersion, "v1.29.10+k3s1")
}

// Check that the registry is running on the correct NodePort
Expand Down