Merge pull request #1898 from thomasferrandiz/update-e2e-tests

testing: update k8s, bash_unit and etcd versions

Documentation/building.md

@@ -34,6 +34,8 @@ make buildx-create-builder
 
 See the [buildx documentation](https://docs.docker.com/reference/cli/docker/buildx/) for more details.
 
+## Running the tests locally
+To run the end-to-end tests locally, you need to installl [Docker compose](https://docs.docker.com/compose/install/).
 
 ## Building manually
 

Makefile

@@ -3,6 +3,7 @@
 # Registry used for publishing images
 REGISTRY?=quay.io/coreos/flannel
 QEMU_VERSION=v3.0.0
+BASH_UNIT_VERSION=v2.3.0
 
 # Default tag and architecture. Can be overridden
 TAG?=$(shell git describe --tags --always)
@@ -128,7 +129,7 @@ verify-modules:
 
 
 bash_unit:
-	wget https://raw.githubusercontent.com/pgrange/bash_unit/v2.0.1/bash_unit
+	wget https://raw.githubusercontent.com/pgrange/bash_unit/$(BASH_UNIT_VERSION)/bash_unit
 	chmod +x bash_unit
 
 # This will build flannel natively using golang image

dist/functional-test-k8s.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 ARCH="${ARCH:-amd64}"
-ETCD_IMG="${ETCD_IMG:-quay.io/coreos/etcd:v3.5.1}"
+ETCD_IMG="${ETCD_IMG:-quay.io/coreos/etcd:v3.5.12}"
 ETCD_LOCATION="${ETCD_LOCATION:-etcd}"
 FLANNEL_NET="${FLANNEL_NET:-10.10.0.0/16}"
 TAG=`git describe --tags --dirty`
 FLANNEL_DOCKER_IMAGE="${FLANNEL_DOCKER_IMAGE:-quay.io/coreos/flannel:$TAG}"
-K8S_VERSION="${K8S_VERSION:-1.25.2}"
+K8S_VERSION="${K8S_VERSION:-1.28.7}"
 HYPERKUBE_IMG="docker.io/rancher/hyperkube"
 HYPERKUBE_CMD="${HYPERKUBE_CMD:-" "}"
 HYPERKUBE_APISERVER_CMD="${HYPERKUBE_APISERVER_CMD:-kube-apiserver}"

dist/functional-test.sh

@@ -4,9 +4,9 @@
 set -xe
 
 ARCH="${ARCH:-amd64}"
-ETCD_IMG="${ETCD_IMG:-quay.io/coreos/etcd:v3.5.1}"
+ETCD_IMG="${ETCD_IMG:-quay.io/coreos/etcd:v3.5.12}"
 # etcd might take a bit to come up - use a known etcd version so we know we have etcdctl available
-ETCDCTL_IMG="quay.io/coreos/etcd:v3.5.1"
+ETCDCTL_IMG="quay.io/coreos/etcd:v3.5.12"
 ETCD_LOCATION="${ETCD_LOCATION:-etcd}"
 FLANNEL_NET="${FLANNEL_NET:-10.10.0.0/16}"
 TAG=`git describe --tags --dirty --always`

e2e/Dockerfile

@@ -1,9 +1,9 @@
 # Install the all-in-one binary so we can copy our run-time images into the image
 # which helps avoid pulling them when running e2e tests.
-ARG SLES="registry.suse.com/suse/sle15:15.3"
+ARG SLES="registry.suse.com/suse/sle15:15.4"
 FROM ${SLES} AS k3s
 ARG ARCH
-ARG K3S_VERSION="v1.26.4+k3s1"
+ARG K3S_VERSION="v1.28.7+k3s1"
 ARG CNI_VERSION="v1.1.1" 
 RUN set -x \
  && zypper -n in \