Skip to content

Upgrade CI to 1.35.0-k3s1 using etcd #4670

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

Merged
0xavi0 merged 3 commits into from
Feb 19, 2026
Merged

Upgrade CI to 1.35.0-k3s1 using etcd #4670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62f820d
Upgrade CI to 1.35.0-k3s1 using etcd
0xavi0 Feb 18, 2026
a43723c
Changes after code review
0xavi0 Feb 18, 2026
2e591e9
Changes after code review
0xavi0 Feb 19, 2026
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
5 changes: 3 additions & 2 deletions .github/workflows/benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
GOARCH: amd64
CGO_ENABLED: 0
SETUP_K3D_VERSION: "v5.8.3"
SETUP_K3S_VERSION: "v1.34.1-k3s1"
SETUP_K3S_VERSION: "v1.35.1-k3s1"
# Defaults for both manual and scheduled runs
BENCH_TIMEOUT: ${{ github.event.inputs.timeout || '2m' }}
BENCH_NAMESPACE: ${{ github.event.inputs.namespace || 'fleet-local' }}
Expand Down Expand Up @@ -72,7 +72,8 @@ jobs:
run: |
k3d cluster create upstream --wait \
--agents 1 \
--image docker.io/rancher/k3s:${{ env.SETUP_K3S_VERSION }}
--image docker.io/rancher/k3s:${{ env.SETUP_K3S_VERSION }} \
--k3s-arg "--cluster-init@server:0"

- name: Import Images Into k3d
run: |
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/e2e-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
# k3d version list k3s | sed 's/+/-/' | sort -h
# https://hub.docker.com/r/rancher/k3s/tags
- name: k3s-new
version: v1.34.1-k3s1
version: v1.35.1-k3s1
- name: k3s-old
version: v1.33.5-k3s1
version: v1.33.8-k3s1
test_type:
- name: default
- name: sharding
Expand Down Expand Up @@ -113,7 +113,8 @@ jobs:
if k3d cluster create upstream --wait \
--agents 1 \
--network "nw01" \
--image docker.io/rancher/k3s:${{matrix.k3s.version}}; then
--image docker.io/rancher/k3s:${{matrix.k3s.version}} \
--k3s-arg "--cluster-init@server:0"; then
echo "Cluster created successfully"
break
else
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/e2e-fleet-upgrade-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
matrix:
k3s:
- name: k3s-new
version: v1.34.1-k3s1
version: v1.35.1-k3s1
name: fleet-upgrade-test-${{ matrix.k3s.name }}

steps:
Expand Down Expand Up @@ -77,7 +77,8 @@ jobs:
k3d cluster create upstream --wait \
--agents 1 \
--network "nw01" \
--image docker.io/rancher/k3s:${{matrix.k3s.version}}
--image docker.io/rancher/k3s:${{matrix.k3s.version}} \
--k3s-arg "--cluster-init@server:0"
-
name: Deploy Latest Release
run: |
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/e2e-nightly-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
workflow_dispatch:
inputs:
k3s_version:
description: 'K3s version to test (e.g., v1.34.1-k3s1)'
description: 'K3s version to test (e.g., v1.35.1-k3s1)'
required: false
default: 'v1.34.1-k3s1'
default: 'v1.35.0-k3s1'
test_type:
description: 'Test type to run'
required: false
Expand All @@ -35,7 +35,7 @@ jobs:
k3s_version:
# k3d version list k3s | sed 's/+/-/' | sort -h
# https://hub.docker.com/r/rancher/k3s/tags
- ${{ github.event.inputs.k3s_version || 'v1.34.1-k3s1' }}
- ${{ github.event.inputs.k3s_version || 'v1.35.0-k3s1' }}
- ${{ github.event_name == 'schedule' && 'v1.33.5-k3s1' || '' }}
test_type:
- ${{ github.event.inputs.test_type || 'acceptance' }}
Expand Down Expand Up @@ -112,7 +112,8 @@ jobs:
k3d cluster create upstream --wait \
--agents 1 \
--network "nw01" \
--image docker.io/rancher/k3s:${{matrix.k3s_version}}
--image docker.io/rancher/k3s:${{matrix.k3s_version}} \
--k3s-arg "--cluster-init@server:0"
-
name: Import Images Into k3d
run: |
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
GOARCH: amd64
CGO_ENABLED: 0
SETUP_K3D_VERSION: 'v5.8.3'
SETUP_K3S_VERSION: 'v1.34.1-k3s1'
SETUP_K3S_VERSION: 'v1.35.1-k3s1'

jobs:
rancher-fleet-integration:
Expand Down Expand Up @@ -150,7 +150,8 @@ jobs:
--k3s-arg '--kubelet-arg=eviction-hard=imagefs.available<1%,nodefs.available<1%@agent:*' \
--k3s-arg '--kubelet-arg=eviction-minimum-reclaim=imagefs.available=1%,nodefs.available=1%@agent:*' \
--network "nw01" \
--image docker.io/rancher/k3s:${{ env.SETUP_K3S_VERSION }}
--image docker.io/rancher/k3s:${{ env.SETUP_K3S_VERSION }} \
--k3s-arg "--cluster-init@server:0"
-
name: Set up k3d downstream cluster
run: |
Expand All @@ -162,7 +163,8 @@ jobs:
--k3s-arg '--kubelet-arg=eviction-hard=imagefs.available<1%,nodefs.available<1%@agent:*' \
--k3s-arg '--kubelet-arg=eviction-minimum-reclaim=imagefs.available=1%,nodefs.available=1%@agent:*' \
--network "nw01" \
--image docker.io/rancher/k3s:${{ env.SETUP_K3S_VERSION }}
--image docker.io/rancher/k3s:${{ env.SETUP_K3S_VERSION }} \
--k3s-arg "--cluster-init@server:0"
-
name: Set up Rancher
env:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/e2e-rancher-upgrade-fleet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
# k3d version list k3s | sed 's/+/-/' | sort -h
description: "K3s version to use"
required: true
default: "v1.34.1-k3s1"
default: "v1.35.1-k3s1"
rancher_version:
description: "Rancher version to install"
required: true
Expand Down Expand Up @@ -119,7 +119,8 @@ jobs:
--k3s-arg '--kubelet-arg=eviction-hard=imagefs.available<1%,nodefs.available<1%@agent:*' \
--k3s-arg '--kubelet-arg=eviction-minimum-reclaim=imagefs.available=1%,nodefs.available=1%@agent:*' \
--network "nw01" \
--image docker.io/rancher/k3s:${{github.event.inputs.k3s_version}}
--image docker.io/rancher/k3s:${{github.event.inputs.k3s_version}} \
--k3s-arg "--cluster-init@server:0"
-
name: Set up k3d downstream cluster
run: |
Expand All @@ -131,7 +132,8 @@ jobs:
--k3s-arg '--kubelet-arg=eviction-hard=imagefs.available<1%,nodefs.available<1%@agent:*' \
--k3s-arg '--kubelet-arg=eviction-minimum-reclaim=imagefs.available=1%,nodefs.available=1%@agent:*' \
--network "nw01" \
--image docker.io/rancher/k3s:${{github.event.inputs.k3s_version}}
--image docker.io/rancher/k3s:${{github.event.inputs.k3s_version}} \
--k3s-arg "--cluster-init@server:0"
-
name: Set up Rancher
env:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/e2e-test-fleet-in-rancher.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
GOARCH: amd64
CGO_ENABLED: 0
SETUP_K3D_VERSION: 'v5.8.3'
SETUP_K3S_VERSION: 'v1.33.4-k3s1'
SETUP_K3S_VERSION: 'v1.35.1-k3s1'

jobs:
release-against-test-charts:
Expand Down Expand Up @@ -146,7 +146,8 @@ jobs:
--k3s-arg '--kubelet-arg=eviction-hard=imagefs.available<1%,nodefs.available<1%@agent:*' \
--k3s-arg '--kubelet-arg=eviction-minimum-reclaim=imagefs.available=1%,nodefs.available=1%@agent:*' \
--network "nw01" \
--image docker.io/rancher/k3s:${{ env.SETUP_K3S_VERSION }}
--image docker.io/rancher/k3s:${{ env.SETUP_K3S_VERSION }} \
--k3s-arg "--cluster-init@server:0"

-
name: Set up k3d downstream cluster
Expand All @@ -159,7 +160,8 @@ jobs:
--k3s-arg '--kubelet-arg=eviction-hard=imagefs.available<1%,nodefs.available<1%@agent:*' \
--k3s-arg '--kubelet-arg=eviction-minimum-reclaim=imagefs.available=1%,nodefs.available=1%@agent:*' \
--network "nw01" \
--image docker.io/rancher/k3s:${{ env.SETUP_K3S_VERSION }}
--image docker.io/rancher/k3s:${{ env.SETUP_K3S_VERSION }} \
--k3s-arg "--cluster-init@server:0"

-
name: Set up latest Rancher
Expand Down