Skip to content

pin k8s versions with integration tests #7236

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
merged 5 commits into from
Nov 11, 2021
Merged

pin k8s versions with integration tests #7236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f503dc5
pin k8s versions with integration tests
Pothulapati Nov 8, 2021
fbc7979
use latest args
Pothulapati Nov 8, 2021
d854761
add node labels with k3d commands
Pothulapati Nov 8, 2021
d91418e
remove `k3d-min` and use the same latest binary
Pothulapati Nov 10, 2021
8282b89
print k8s versions before running
Pothulapati Nov 10, 2021
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
27 changes: 22 additions & 5 deletions bin/_test-helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ check_linkerd_binary() {

check_cluster() {
check_if_k8s_reachable
kubectl version
check_if_l5d_exists
}

Expand All @@ -229,6 +230,18 @@ cleanup_cluster() {
exit_on_err 'error removing existing Linkerd resources'
}

setup_min_cluster() {
local name=$1
export helm_path="$bindir"/helm

test_setup
if [ -z "$skip_cluster_create" ]; then
"$bindir"/k3d cluster create "$@" --image +v1.20
image_load "$name"
fi
check_cluster
}

setup_cluster() {
local name=$1
export helm_path="$bindir"/helm
Expand Down Expand Up @@ -304,20 +317,20 @@ image_load() {

start_test() {
local name=$1
local config=(--no-hostip --k3s-server-arg '--disable=local-storage,metrics-server')
local config=(--k3s-arg '--disable=local-storage,metrics-server@server:0')

case $name in
cluster-domain)
config=("$name" "${config[@]}" --no-lb --k3s-server-arg --cluster-domain=custom.domain --k3s-server-arg '--disable=servicelb,traefik')
config=("$name" "${config[@]}" --no-lb --k3s-arg --cluster-domain=custom.domain --k3s-arg '--disable=servicelb,traefik@server:0')
;;
cni-calico-deep)
config=("$name" "${config[@]}" --no-lb --k3s-server-arg --write-kubeconfig-mode=644 --k3s-server-arg --flannel-backend=none --k3s-server-arg --cluster-cidr=192.168.0.0/16 --k3s-server-arg '--disable=servicelb,traefik')
config=("$name" "${config[@]}" --no-lb --k3s-arg --write-kubeconfig-mode=644 --k3s-arg --flannel-backend=none --k3s-arg --cluster-cidr=192.168.0.0/16 --k3s-arg '--disable=servicelb,traefik@server:0')
;;
multicluster)
config=("${config[@]}" --network multicluster-test)
;;
*)
config=("$name" "${config[@]}" --no-lb --k3s-server-arg '--disable=servicelb,traefik')
config=("$name" "${config[@]}" --no-lb --k3s-arg '--disable=servicelb,traefik@server:0')
;;
esac

Expand All @@ -330,7 +343,11 @@ start_test() {

start_single_test() {
name=$1
setup_cluster "$@"
if [ "$name" == "helm-deep" ]; then
setup_min_cluster "$@"
else
setup_cluster "$@"
fi
if [ -n "$cleanup_docker" ]; then
rm -rf image-archives
docker system prune --force --all
Expand Down
6 changes: 2 additions & 4 deletions bin/k3d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

set -eu

k3dversion=v4.4.5

bindir=$( cd "${0%/*}" && pwd )
targetbin=$( cd "$bindir"/.. && pwd )/target/bin
k3dbin=$targetbin/.k3d-$k3dversion
k3dbin=$targetbin/.k3d

if [ ! -f "$k3dbin" ]; then
if [ "$(uname -s)" = Darwin ]; then
Expand All @@ -24,7 +22,7 @@ if [ ! -f "$k3dbin" ]; then
fi

mkdir -p "$targetbin"
curl -sfL -o "$k3dbin" https://github.com/rancher/k3d/releases/download/$k3dversion/k3d-$os-$arch
curl -sfL -o "$k3dbin" https://github.com/rancher/k3d/releases/latest/download/k3d-$os-$arch
chmod +x "$k3dbin"
fi

Expand Down