feat: support k8 v1.26 (#3196)

Co-authored-by: Nick Cardin <nick@cardin.email>
infinyon · Apr 26, 2023 · 09655a1 · 09655a1
1 parent 4cabea8
commit 09655a1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,8 +32,8 @@ env:
   VERBOSE: ${{ github.events.input.verbose }}
   K3D_VERSION: v5.4.9
   BATS_VERSION: 1.9.0
-  MINIKUBE_VERSION: v1.29.0
-  K8_VERSION: 1.23.17
+  MINIKUBE_VERSION: v1.30.1
+  K8_VERSION: v1.26.3
   TLS_ARGS: --tls --domain fluvio.local --server-key ./tls/certs/server.key --server-cert ./tls/certs/server.crt --ca-cert ./tls/certs/ca.crt --client-cert ./tls/certs/client-root.crt --client-key ./tls/certs/client-root.key
   AUTH_FILE: crates/fluvio-sc/test-data/auth_config/policy.json
   X509_SCOPE_FILE: crates/fluvio-sc/test-data/auth_config/scopes.json

diff --git a/k8-util/cluster/reset-k3d.sh b/k8-util/cluster/reset-k3d.sh
@@ -2,5 +2,8 @@
 # delete and re-install k3d cluster ready for fluvio
 # this defaults to docker and assume you have have sudo access
 set -e
+
+K8_VERSION=${K8_VERSION:-v1.26.3}
+
 k3d cluster delete fluvio
-k3d cluster create fluvio
+k3d cluster create fluvio --image rancher/k3s:${K8_VERSION}-k3s1
diff --git a/k8-util/cluster/reset-minikube.sh b/k8-util/cluster/reset-minikube.sh
@@ -3,20 +3,20 @@
 # it uses docker as default driver
 set -e
 set -x
-K8_VERSION=${2:-1.21.2}
+K8_VERSION=${K8_VERSION:-v1.26.3}
 
 # set up default driver, use hyperkit for mac
 if [ "$(uname)" == "Darwin" ]; then
 
-DRIVER=${1:-hyperkit}
+DRIVER=${DRIVER:-hyperkit}
 echo "Using driver: $DRIVER"
 # for mac, if driver is docker, set up proxy
 if [ ${DRIVER} == "docker" ]; then
 EXTRA_CONFIG="--extra-config=apiserver.service-node-port-range=32700-32800 --ports=127.0.0.1:32700-32800:32700-32800"
 fi
 
 else 
-DRIVER=${1:-docker}
+DRIVER=${DRIVER:-docker}
 fi