From 9e522952c39b0e2f62e90b8f019c59d49959a66f Mon Sep 17 00:00:00 2001
From: Pires <pjpires@gmail.com>
Date: Sun, 10 Jan 2021 15:34:23 +0000
Subject: [PATCH] e2e: test with Kubernetes to 1.20.1

Signed-off-by: Pires <pjpires@gmail.com>
---
 .circleci/config.yml                       | 20 +++++++++----
 hack/skaffold/virtual-kubelet/skaffold.yml |  2 +-
 test/e2e/README.md                         | 35 ++++++++++++++--------
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6735264d8..2ba099e30 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,4 @@
-version: 2
+version: 2.0
 jobs:
   validate:
     resource_class: xlarge
@@ -52,18 +52,18 @@ jobs:
 
   e2e:
     machine:
-      image: circleci/classic:201808-01
+      image: ubuntu-1604:202010-01
     working_directory: /home/circleci/go/src/github.com/virtual-kubelet/virtual-kubelet
     environment:
       CHANGE_MINIKUBE_NONE_USER: true
       GOPATH: /home/circleci/go
       KUBECONFIG: /home/circleci/.kube/config
-      KUBERNETES_VERSION: v1.17.6
+      KUBERNETES_VERSION: v1.20.1
       MINIKUBE_HOME: /home/circleci
-      MINIKUBE_VERSION: v1.2.0
+      MINIKUBE_VERSION: v1.16.0
       MINIKUBE_WANTUPDATENOTIFICATION: false
       MINIKUBE_WANTREPORTERRORPROMPT: false
-      SKAFFOLD_VERSION: v0.33.0
+      SKAFFOLD_VERSION: v1.17.2
       GO111MODULE: "on"
     steps:
       - checkout
@@ -81,6 +81,16 @@ jobs:
             curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/${SKAFFOLD_VERSION}/skaffold-linux-amd64
             chmod +x skaffold
             sudo mv skaffold /usr/local/bin/
+      - run:
+          name: Install Minikube dependencies
+          command: |
+            sudo apt-get update && sudo apt-get install -y apt-transport-https curl
+            curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
+            cat <<EOF | sudo tee /etc/apt/sources.list.d/kubernetes.list
+            deb https://apt.kubernetes.io/ kubernetes-xenial main
+            EOF
+            sudo apt-get update
+            sudo apt-get install -y kubelet # systemd unit is disabled
       - run:
           name: Install Minikube
           command: |
diff --git a/hack/skaffold/virtual-kubelet/skaffold.yml b/hack/skaffold/virtual-kubelet/skaffold.yml
index a95c4c79f..0d861828c 100644
--- a/hack/skaffold/virtual-kubelet/skaffold.yml
+++ b/hack/skaffold/virtual-kubelet/skaffold.yml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta12
+apiVersion: skaffold/v2beta10
 kind: Config
 build:
   artifacts:
diff --git a/test/e2e/README.md b/test/e2e/README.md
index 9ae59fcd7..75e1dae86 100644
--- a/test/e2e/README.md
+++ b/test/e2e/README.md
@@ -169,30 +169,39 @@ You can see from the console output whether the tests in the test suite pass or
 ```console
 ...
 === RUN   TestEndToEnd
+Setting up end-to-end test suite for mock provider...
+    suite.go:62: True
 === RUN   TestEndToEnd/TestCreatePodWithMandatoryInexistentConfigMap
 === RUN   TestEndToEnd/TestCreatePodWithMandatoryInexistentSecrets
 === RUN   TestEndToEnd/TestCreatePodWithOptionalInexistentConfigMap
 === RUN   TestEndToEnd/TestCreatePodWithOptionalInexistentSecrets
+=== RUN   TestEndToEnd/TestGetPods
+    basic.go:40: Created pod: nginx-testgetpods-g9s42
+    basic.go:46: Pod nginx-testgetpods-g9s42 ready
 === RUN   TestEndToEnd/TestGetStatsSummary
 === RUN   TestEndToEnd/TestNodeCreateAfterDelete
 === RUN   TestEndToEnd/TestPodLifecycleForceDelete
+    basic.go:208: Created pod: nginx-testpodlifecycleforcedelete-wrjgk
+    basic.go:214: Pod nginx-testpodlifecycleforcedelete-wrjgk ready
+    basic.go:247: Force deleted pod:  nginx-testpodlifecycleforcedelete-wrjgk
+    basic.go:264: Pod ended as phase: Running
 === RUN   TestEndToEnd/TestPodLifecycleGracefulDelete
---- PASS: TestEndToEnd (21.93s)
-    --- PASS: TestEndToEnd/TestCreatePodWithMandatoryInexistentConfigMap (0.03s)
+    basic.go:135: Created pod: nginx-testpodlifecyclegracefuldelete-tp49x
+    basic.go:141: Pod nginx-testpodlifecyclegracefuldelete-tp49x ready
+    basic.go:168: Deleted pod: nginx-testpodlifecyclegracefuldelete-tp49x
+Tearing down end-to-end test suite for mock provider...
+--- PASS: TestEndToEnd (11.75s)
+    --- PASS: TestEndToEnd/TestCreatePodWithMandatoryInexistentConfigMap (0.04s)
     --- PASS: TestEndToEnd/TestCreatePodWithMandatoryInexistentSecrets (0.03s)
-    --- PASS: TestEndToEnd/TestCreatePodWithOptionalInexistentConfigMap (0.55s)
-    --- PASS: TestEndToEnd/TestCreatePodWithOptionalInexistentSecrets (0.99s)
+    --- PASS: TestEndToEnd/TestCreatePodWithOptionalInexistentConfigMap (0.73s)
+    --- PASS: TestEndToEnd/TestCreatePodWithOptionalInexistentSecrets (1.00s)
+    --- PASS: TestEndToEnd/TestGetPods (0.80s)
     --- PASS: TestEndToEnd/TestGetStatsSummary (0.80s)
-    --- PASS: TestEndToEnd/TestNodeCreateAfterDelete (9.63s)
+    --- PASS: TestEndToEnd/TestNodeCreateAfterDelete (5.25s)
     --- PASS: TestEndToEnd/TestPodLifecycleForceDelete (2.05s)
-        basic.go:158: Created pod: nginx-testpodlifecycleforcedelete-jz84g
-        basic.go:164: Pod nginx-testpodlifecycleforcedelete-jz84g ready
-        basic.go:197: Force deleted pod:  nginx-testpodlifecycleforcedelete-jz84g
-        basic.go:214: Pod ended as phase: Running
-    --- PASS: TestEndToEnd/TestPodLifecycleGracefulDelete (1.04s)
-        basic.go:87: Created pod: nginx-testpodlifecyclegracefuldelete-r84v7
-        basic.go:93: Pod nginx-testpodlifecyclegracefuldelete-r84v7 ready
-        basic.go:120: Deleted pod: nginx-testpodlifecyclegracefuldelete-r84v7
+    --- PASS: TestEndToEnd/TestPodLifecycleGracefulDelete (1.05s)
 PASS
+ok      github.com/virtual-kubelet/virtual-kubelet/internal/test/e2e    12.298s
+?       github.com/virtual-kubelet/virtual-kubelet/internal/test/e2e/framework  [no test files]
 ...
 ```