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

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

Merged
merged 1 commit into from
Mar 26, 2024
Merged

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

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
8 changes: 5 additions & 3 deletions .github/workflows/test_e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
k3s: [ v1.26, v1.27, v1.28, v1.29 ]
# 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, v1.27.9+k3s1, v1.28.5+k3s1, v1.29.0+k3s1 ]
fail-fast: false

env:
K3S_CHANNEL: ${{ matrix.k3s }}
K3S_VERSION: ${{ matrix.k3s }}
SCOPE: gha-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.k3s }}

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

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

# Disable routes in dev-env, not supported for Robot.
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 @@ -19,13 +19,16 @@ if [[ -n "${DEBUG:-}" ]]; then set -x; fi

trap error ERR

image_name=${IMAGE_NAME:-ubuntu-20.04}
image_name=${IMAGE_NAME:-ubuntu-22.04}
instance_count=${INSTANCES:-1}
instance_type=${INSTANCE_TYPE:-cpx11}
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 @@ -105,7 +108,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 Down
Loading