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

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

Merged
merged 1 commit into from
Mar 27, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: |
Expand Down
9 changes: 6 additions & 3 deletions hack/dev-up.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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.

Expand All @@ -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
) &

Expand Down
Loading