test(e2e): new k3s versions break our dev/e2e test setup (#583)

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.
hetznercloud · Mar 27, 2024 · 0512f56 · 0512f56
1 parent fe1012a
commit 0512f56
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -38,13 +38,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - k3s: v1.26
+          # All k3s after January 2024 break our e2e tests, we hardcode
+          # the versions for now until we can fix the source of this.
+          - k3s: v1.26.12+k3s1
             k8s-test: v1.26.12
-          - k3s: v1.27
+          - k3s: v1.27.9+k3s1
             k8s-test: v1.27.9
-          - k3s: v1.28
+          - k3s: v1.28.5+k3s1
             k8s-test: v1.28.5
-          - k3s: v1.29
+          - k3s: v1.29.0+k3s1
             k8s-test: v1.29.0
 
     steps:
@@ -70,7 +72,7 @@ jobs:
 
       - name: Run tests
         env:
-          K3S_CHANNEL: ${{ matrix.k3s }}
+          K3S_VERSION: ${{ matrix.k3s }}
           K8S_TEST_VERSION: ${{ matrix.k8s-test }}
           SCOPE: gha-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.k3s }}
         run: |

diff --git a/hack/dev-up.sh b/hack/dev-up.sh
@@ -25,7 +25,10 @@ if [[ -n "${DEBUG:-}" ]]; then set -x; fi
   location=${LOCATION:-fsn1}
   network_zone=${NETWORK_ZONE:-eu-central}
   ssh_keys=${SSH_KEYS:-}
-  channel=${K3S_CHANNEL:-stable}
+  # All k3s after January 2024 break our e2e tests, we hardcode
+  # the versions for now until we can fix the source of this.
+  # channel=${K3S_CHANNEL:-stable}
+  k3s_version=${K3S_VERSION:-v1.28.5+k3s1}
   network_cidr=${NETWORK_CIDR:-10.0.0.0/8}
   subnet_cidr=${SUBNET_CIDR:-10.0.0.0/24}
   cluster_cidr=${CLUSTER_CIDR:-10.244.0.0/16}
@@ -99,7 +102,7 @@ if [[ -n "${DEBUG:-}" ]]; then set -x; fi
 
       if [[ "$num" == "1" ]]; then
         # First node is control plane.
-        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
+        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
       else
         # All subsequent nodes are initialized as workers.
 
@@ -108,7 +111,7 @@ if [[ -n "${DEBUG:-}" ]]; then set -x; fi
           sleep 1
         done
 
-        k3sup join --server-ip $(hcloud server ip $scope_name-1) --ip $ip --k3s-channel $channel --k3s-extra-args "${k3s_opts} ${k3s_node_ip_opts}" --ssh-key $ssh_private_key
+        k3sup join --server-ip $(hcloud server ip $scope_name-1) --ip $ip --k3s-version "${k3s_version}" --k3s-extra-args "${k3s_opts} ${k3s_node_ip_opts}" --ssh-key $ssh_private_key
       fi
     ) &