From 5854904f0d637f3ca7f266431ee19da7e8d32b83 Mon Sep 17 00:00:00 2001 From: Pires Date: Wed, 3 Jul 2019 13:59:15 +0100 Subject: [PATCH 1/6] skaffold: bump to 0.33.0 and API v1beta12 Signed-off-by: Pires --- .circleci/config.yml | 4 ++-- hack/skaffold/virtual-kubelet/skaffold.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e5b4563b..d31ef64fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: MINIKUBE_VERSION: v0.30.0 MINIKUBE_WANTUPDATENOTIFICATION: false MINIKUBE_WANTREPORTERRORPROMPT: false - SKAFFOLD_VERSION: v0.18.0 + SKAFFOLD_VERSION: v0.33.0 GO111MODULE: "on" steps: - checkout @@ -77,7 +77,7 @@ jobs: - run: name: Install Skaffold command: | - curl -Lo skaffold https://github.com/GoogleContainerTools/skaffold/releases/download/${SKAFFOLD_VERSION}/skaffold-linux-amd64 + curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/${SKAFFOLD_VERSION}/skaffold-linux-amd64 chmod +x skaffold sudo mv skaffold /usr/local/bin/ - run: diff --git a/hack/skaffold/virtual-kubelet/skaffold.yml b/hack/skaffold/virtual-kubelet/skaffold.yml index ba72b45f3..a95c4c79f 100644 --- a/hack/skaffold/virtual-kubelet/skaffold.yml +++ b/hack/skaffold/virtual-kubelet/skaffold.yml @@ -1,4 +1,4 @@ -apiVersion: skaffold/v1alpha5 +apiVersion: skaffold/v1beta12 kind: Config build: artifacts: From 3a88dfd4130bad340b4c82724f7d52c5ce1caa63 Mon Sep 17 00:00:00 2001 From: Pires Date: Wed, 3 Jul 2019 14:03:03 +0100 Subject: [PATCH 2/6] e2e: use Kubernetes v1.13.7 in CI I failed to do this as part of #683. Signed-off-by: Pires --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d31ef64fc..6e6dfb3ae 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,7 +57,7 @@ jobs: CHANGE_MINIKUBE_NONE_USER: true GOPATH: /home/circleci/go KUBECONFIG: /home/circleci/.kube/config - KUBERNETES_VERSION: v1.12.3 + KUBERNETES_VERSION: v1.13.7 MINIKUBE_HOME: /home/circleci MINIKUBE_VERSION: v0.30.0 MINIKUBE_WANTUPDATENOTIFICATION: false From 1bab3ea80f411465ebe9cb47408939241c107586 Mon Sep 17 00:00:00 2001 From: Pires Date: Wed, 3 Jul 2019 14:03:58 +0100 Subject: [PATCH 3/6] e2e: bump Minikube to v1.2.0 Signed-off-by: Pires --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e6dfb3ae..8cfa71624 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,7 +59,7 @@ jobs: KUBECONFIG: /home/circleci/.kube/config KUBERNETES_VERSION: v1.13.7 MINIKUBE_HOME: /home/circleci - MINIKUBE_VERSION: v0.30.0 + MINIKUBE_VERSION: v1.2.0 MINIKUBE_WANTUPDATENOTIFICATION: false MINIKUBE_WANTREPORTERRORPROMPT: false SKAFFOLD_VERSION: v0.33.0 @@ -83,7 +83,7 @@ jobs: - run: name: Install Minikube command: | - curl -Lo minikube https://github.com/kubernetes/minikube/releases/download/${MINIKUBE_VERSION}/minikube-linux-amd64 + curl -Lo minikube https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-amd64 chmod +x minikube sudo mv minikube /usr/local/bin/ - run: From 3371c727a649abf8d00dc1ab366b357fabfc4049 Mon Sep 17 00:00:00 2001 From: Pires Date: Wed, 3 Jul 2019 14:04:21 +0100 Subject: [PATCH 4/6] e2e: bump Go to v1.12.6 Signed-off-by: Pires --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8cfa71624..2b347ecdc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -110,7 +110,7 @@ jobs: command: | mkdir $HOME/.go export PATH=$HOME/.go/bin:${PATH} - curl -fsSL -o "/tmp/go.tar.gz" "https://dl.google.com/go/go1.12.5.linux-amd64.tar.gz" + curl -fsSL -o "/tmp/go.tar.gz" "https://dl.google.com/go/go1.12.6.linux-amd64.tar.gz" tar -C $HOME/.go --strip-components=1 -xzf "/tmp/go.tar.gz" go version make e2e From ad943ebbd8628ab30d00028001c363f98f22d1e4 Mon Sep 17 00:00:00 2001 From: Pires Date: Wed, 3 Jul 2019 14:05:28 +0100 Subject: [PATCH 5/6] e2e: remove unnecessary steps Signed-off-by: Pires --- .circleci/config.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b347ecdc..3068d6f8f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,21 +33,9 @@ jobs: - run: name: Build command: V=1 make build - - run: - name: Install Nomad - command: | - curl \ - --silent \ - --location \ - --output nomad.zip \ - https://releases.hashicorp.com/nomad/0.8.6/nomad_0.8.6_linux_amd64.zip && \ - unzip nomad.zip && \ - chmod +x nomad && \ - mv nomad /go/bin/nomad && \ - rm nomad.zip - run: name: Tests - command: V=1 CI=1 SKIP_AWS_E2E=1 make test + command: V=1 CI=1 make test e2e: machine: From ab3086436ecb6f3ab29102926729a7e9b36dc5f4 Mon Sep 17 00:00:00 2001 From: Pires Date: Wed, 3 Jul 2019 14:16:26 +0100 Subject: [PATCH 6/6] e2e: silence kubectl context validation Signed-off-by: Pires --- Makefile.e2e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.e2e b/Makefile.e2e index f5fb5f8be..5c5b6b9cf 100644 --- a/Makefile.e2e +++ b/Makefile.e2e @@ -1,7 +1,7 @@ .PHONY: skaffold.validate skaffold.validate: kubectl_context := $(shell kubectl config current-context) skaffold.validate: - if [[ ! "minikube,docker-for-desktop,docker-desktop" =~ .*"$(kubectl_context)".* ]]; then \ + @if [[ ! "minikube,docker-for-desktop,docker-desktop" =~ .*"$(kubectl_context)".* ]]; then \ echo current-context is [$(kubectl_context)]. Must be one of [minikube,docker-for-desktop,docker-desktop]; \ false; \ fi