feat(ci): remove minikube jobs and use multiple k3d jobs

Run against minimum and maximum supported k8s version in a k3d job This enables us to get rid of minikube jobs Signed-off-by: Charly Molter <charly.molter@konghq.com>
kumahq · Dec 17, 2021 · 1f6ae1e · 1f6ae1e
1 parent 2efb5d9
commit 1f6ae1e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -809,6 +809,10 @@ jobs:
         description: use IPv6
         type: boolean
         default: false
+      k3sVersion:
+        description: version of k3s to use
+        type: string
+        default: v1.22.4-k3s1
     parallelism: 8
     environment:
       GOPATH: /home/circleci/.go-kuma-go
@@ -873,6 +877,7 @@ jobs:
             - run:
                 name: "Run IPv4 E2E tests"
                 command: |
+                  export CI_K3S_VERSION=<< parameters.k3sVersion >>
                   export E2E_PKG_LIST=$(circleci tests glob ./test/e2e/* | circleci tests split --total=$(ls test/e2e | wc -l) | xargs printf "./%s/... ")
                   export API_VERSION=<< parameters.api >>
                   export GINKGO_XUNIT_RESULTS_DIR=/tmp/xunit
@@ -1166,31 +1171,19 @@ workflows:
         - check
         # custom parameters
         use_local_kuma_images: true
-    - example_minikube:
-        <<: *commit_workflow_filters
-        name: minikube_v1_18
-        requires:
-          - images
-          - check
-        # custom parameters
-        kubernetes_version: v1.18.20
-        use_local_kuma_images: true
-    - example_minikube:
+    - e2e:
         <<: *commit_workflow_filters
-        name: minikube_v1_20
+        name: test/e2e-ipv4
         requires:
           - images
           - check
-        # custom parameters
-        kubernetes_version: v1.20.13
-        use_local_kuma_images: true
-    - e2e:
+    - e2e-oldk8s:
         <<: *commit_workflow_filters
         name: test/e2e-ipv4
+        k3sVersion: v1.17.17-k3s1
         requires:
           - images
           - check
-# keep this one disabled and enable only for development
     - e2e:
         <<: *commit_workflow_filters
         name: test/e2e-ipv6

diff --git a/mk/k3d.mk b/mk/k3d.mk
@@ -1,4 +1,5 @@
 CI_K3D_VERSION ?= v5.2.0
+CI_K3S_VERSION ?= v1.22.4-k3s1
 
 KUMA_MODE ?= standalone
 KUMA_NAMESPACE ?= kuma-system
@@ -15,6 +16,7 @@ k3d/network/create:
 k3d/start: ${KIND_KUBECONFIG_DIR} k3d/network/create
 	@KUBECONFIG=$(KIND_KUBECONFIG)  \
 		 k3d cluster create "$(KIND_CLUSTER_NAME)" \
+		 	  -i rancher/k3s:$(CI_K3S_VERSION)
 			  --k3s-arg '--no-deploy=traefik@server:0' \
 			  --k3s-arg '--disable=metrics-server@server:0' \
 			  --network kind \