Skip to content

Commit 6f15923

Browse files
authored
test(e2e): new k3s versions break our dev/e2e test setup (#627)
Hardcode versions of k3s to the last versions before the broken behaviour was introduced. We plan to unpin the versions after we figure out where the bug is coming from and fix it upstream.
1 parent f02077c commit 6f15923

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/workflows/test_e2e.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
k3s: [ v1.26, v1.27, v1.28, v1.29 ]
14+
# All k3s after January 2024 break our e2e tests, we hardcode
15+
# the versions for now until we can fix the source of this.
16+
k3s: [ v1.26.12+k3s1, v1.27.9+k3s1, v1.28.5+k3s1, v1.29.0+k3s1 ]
1517
fail-fast: false
1618

1719
env:
18-
K3S_CHANNEL: ${{ matrix.k3s }}
20+
K3S_VERSION: ${{ matrix.k3s }}
1921
SCOPE: gha-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.k3s }}
2022

2123
# Domain must be available in the account running the tests. This domain is available in the account
@@ -119,7 +121,7 @@ jobs:
119121
environment: e2e-robot
120122

121123
env:
122-
K3S_CHANNEL: v1.29
124+
K3S_VERSION: v1.29.0+k3s1
123125
SCOPE: gha-${{ github.run_id }}-${{ github.run_attempt }}-robot
124126

125127
# Disable routes in dev-env, not supported for Robot.

hack/dev-up.sh

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@ if [[ -n "${DEBUG:-}" ]]; then set -x; fi
1919

2020
trap error ERR
2121

22-
image_name=${IMAGE_NAME:-ubuntu-20.04}
22+
image_name=${IMAGE_NAME:-ubuntu-22.04}
2323
instance_count=${INSTANCES:-1}
2424
instance_type=${INSTANCE_TYPE:-cpx11}
2525
location=${LOCATION:-fsn1}
2626
network_zone=${NETWORK_ZONE:-eu-central}
2727
ssh_keys=${SSH_KEYS:-}
28-
channel=${K3S_CHANNEL:-stable}
28+
# All k3s after January 2024 break our e2e tests, we hardcode
29+
# the versions for now until we can fix the source of this.
30+
# channel=${K3S_CHANNEL:-stable}
31+
k3s_version=${K3S_VERSION:-v1.28.5+k3s1}
2932
network_cidr=${NETWORK_CIDR:-10.0.0.0/8}
3033
subnet_cidr=${SUBNET_CIDR:-10.0.0.0/24}
3134
cluster_cidr=${CLUSTER_CIDR:-10.244.0.0/16}
@@ -105,7 +108,7 @@ if [[ -n "${DEBUG:-}" ]]; then set -x; fi
105108

106109
if [[ "$num" == "1" ]]; then
107110
# First node is control plane.
108-
k3sup install --print-config=false --ip $ip --k3s-channel $channel --k3s-extra-args "${k3s_server_opts} ${k3s_opts} ${k3s_node_ip_opts}" --local-path $KUBECONFIG --ssh-key $ssh_private_key
111+
k3sup install --print-config=false --ip $ip --k3s-version "${k3s_version}" --k3s-extra-args "${k3s_server_opts} ${k3s_opts} ${k3s_node_ip_opts}" --local-path $KUBECONFIG --ssh-key $ssh_private_key
109112
else
110113
# All subsequent nodes are initialized as workers.
111114

0 commit comments

Comments
 (0)