Bump capei dep including changes to support k8s 1.20 (#328)

* upgrade capei deps * ignore .idea folder * updated k8s.io/kube-openapi dep * attempt to fix github.com/googleapis/gnostic issue * added github.com/googleapis/[email protected] * removed googleapis/gnostic replace from go.mod * Change versions 1.17.13 - 1.19.8, 1.19.3 - 1.20.4 * additional k8s versions changes. 1.17.x -> 1.19.8 * additional k8s versions fixes * Testing CAPEI version v0.2.2 * Added 5m sleep * Calling footloose command directly * Update kubectl used in CircleCI to 1.20 * Update kubectl to v1.19.8 and ensure is executable * Update tests to use CAPEI 0.2.2 * Ensure the apply test uses a specific k8s version * Revert version change to upgradeKubeadmConfig chk * Default k8s v1.18.16 from 1.19.8 timing fix * Change coredns back to 1.6.7 for testing * Revert debug code * Updated CAPEI dep with version v0.2.3 including changes to support k8s 1.20 * Update test to v.1.18.15 to fix kubelet timeout * Remove CAPEI build step from CircleCI * Add version for each machine in multi-master test * Updated capei dep with latest commit from master * Update test version of etcd to 3.4.3 * Update CAPEI img in multimaster_test.go to new ver * Updated capei dep with v0.2.4 Co-authored-by: Mark Emeis <[email protected]>
weaveworks · Feb 26, 2021 · 20d783d · 20d783d
1 parent 6fc8f8b
commit 20d783d
Show file tree

Hide file tree

Showing 13 changed files with 437 additions and 379 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,8 +7,8 @@ defaults: &defaults
       environment:
         GOPATH: /go/
         SRCDIR: /src/github.com/weaveworks/wksctl
-        KUBECTL_URL: https://dl.k8s.io/v1.18.5/kubernetes-client-linux-amd64.tar.gz
-        KUBECTL_CHECKSUM: f6051fa7f715c68d56998d9b4c9be4f08552f3a8427b2c6b9e2e5339dd2929b6
+        KUBECTL_URL: https://dl.k8s.io/release/v1.18.15/bin/linux/amd64/kubectl
+        KUBECTL_CHECKSUM: eb5a5dd0a72795942ab81d1e4331625e80a90002c8bb39b2cb15aa707a3812c6
   working_directory: /src/github.com/weaveworks/wksctl
 
 workflows:
@@ -76,10 +76,10 @@ jobs:
       - run:
           name: Install kubectl
           command: |
-            curl -L $KUBECTL_URL -o kubectl.tar.gz
-            echo "$KUBECTL_CHECKSUM kubectl.tar.gz" | sha256sum -c
-            tar xvzf kubectl.tar.gz --strip-components=3
+            curl -L $KUBECTL_URL -o kubectl
+            echo "$KUBECTL_CHECKSUM kubectl" | sha256sum -c
             sudo mv kubectl /usr/local/bin
+            chmod +x /usr/local/bin/kubectl
 
       - run:
           name: Run unit tests
@@ -128,10 +128,8 @@ jobs:
       SRCDIR: /home/circleci/src/github.com/weaveworks/wksctl
       FOOTLOOSE_URL: https://github.com/weaveworks/footloose/releases/download/0.5.0/footloose-0.5.0-linux-x86_64
       FOOTLOOSE_CHECKSUM: 0e4e49e81940c5876eafa26607154acd788d9979e9f4a4215f17532a3ea5429a
-      KUBECTL_URL: https://dl.k8s.io/v1.18.5/kubernetes-client-linux-amd64.tar.gz
-      KUBECTL_CHECKSUM: f6051fa7f715c68d56998d9b4c9be4f08552f3a8427b2c6b9e2e5339dd2929b6
-      CAPEI_URL: https://github.com/weaveworks/cluster-api-provider-existinginfra/archive/v0.0.2.tar.gz
-      CAPEI_CHECKSUM: a2d5d2a0f43a2c0872bcc96265d753868a4f0867f555743a5e280cff73f95cdc
+      KUBECTL_URL: https://dl.k8s.io/release/v1.18.15/bin/linux/amd64/kubectl
+      KUBECTL_CHECKSUM: eb5a5dd0a72795942ab81d1e4331625e80a90002c8bb39b2cb15aa707a3812c6
     working_directory: /home/circleci/src/github.com/weaveworks/wksctl
     steps:
       - checkout
@@ -150,19 +148,10 @@ jobs:
       - run:
           name: Install kubectl
           command: |
-            curl -L $KUBECTL_URL -o kubectl.tar.gz
-            echo "$KUBECTL_CHECKSUM kubectl.tar.gz" | sha256sum -c
-            tar xvzf kubectl.tar.gz --strip-components=3
+            curl -L $KUBECTL_URL -o kubectl
+            echo "$KUBECTL_CHECKSUM kubectl" | sha256sum -c
             sudo mv kubectl /usr/local/bin
-      - run:
-          # TODO: Use CAPEI upstream when its build system has been set up
-          name: Build cluster-api-provider-existinginfra
-          command: |
-            curl -L $CAPEI_URL -o capei.tar.gz
-            echo "$CAPEI_CHECKSUM capei.tar.gz" | sha256sum -c
-            mkdir -p /tmp/capei && tar xvzf capei.tar.gz -C /tmp/capei --strip-components=1
-            export PATH=$GOROOT/bin:$PATH
-            (cd /tmp/capei && docker build -t capei-controller .)
+            chmod +x /usr/local/bin/kubectl
       - restore_cache:
           keys:
             - local-docker-registry-images
@@ -195,10 +184,10 @@ jobs:
       - run:
           name: Install kubectl
           command: |
-            curl -L $KUBECTL_URL -o kubectl.tar.gz
-            echo "$KUBECTL_CHECKSUM kubectl.tar.gz" | sha256sum -c
-            tar xvzf kubectl.tar.gz --strip-components=3
+            curl -L $KUBECTL_URL -o kubectl
+            echo "$KUBECTL_CHECKSUM kubectl" | sha256sum -c
             sudo mv kubectl /usr/local/bin
+            chmod +x /usr/local/bin/kubectl
       - run:
           name: Centos integration tests
           command: |
@@ -222,10 +211,10 @@ jobs:
       - run:
           name: Install kubectl
           command: |
-            curl -L $KUBECTL_URL -o kubectl.tar.gz
-            echo "$KUBECTL_CHECKSUM kubectl.tar.gz" | sha256sum -c
-            tar xvzf kubectl.tar.gz --strip-components=3
+            curl -L $KUBECTL_URL -o kubectl
+            echo "$KUBECTL_CHECKSUM kubectl" | sha256sum -c
             sudo mv kubectl /usr/local/bin
+            chmod +x /usr/local/bin/kubectl
 
       - run:
           name: Ubuntu integration tests
@@ -251,10 +240,10 @@ jobs:
       - run:
           name: Install kubectl
           command: |
-            curl -L $KUBECTL_URL -o kubectl.tar.gz
-            echo "$KUBECTL_CHECKSUM kubectl.tar.gz" | sha256sum -c
-            tar xvzf kubectl.tar.gz --strip-components=3
+            curl -L $KUBECTL_URL -o kubectl
+            echo "$KUBECTL_CHECKSUM kubectl" | sha256sum -c
             sudo mv kubectl /usr/local/bin
+            chmod +x /usr/local/bin/kubectl
 
       - run:
           name: rhel integration tests

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 /rpm/output
 /test/resource/tests
 /test/integration/test/kubectl
+/.idea
 
 # Ignore generated binaries:
 /cmd/controller/controller

diff --git a/environments/local-docker-registry/retag_push.sh b/environments/local-docker-registry/retag_push.sh
@@ -16,20 +16,20 @@ set -e
 
 # Images currently used by WKS:
 IMAGES=(
-k8s.gcr.io/kube-apiserver:v1.17.13
-k8s.gcr.io/kube-controller-manager:v1.17.13
-k8s.gcr.io/kube-scheduler:v1.17.13
-k8s.gcr.io/kube-proxy:v1.17.13
-k8s.gcr.io/pause:3.1
+k8s.gcr.io/kube-apiserver:v1.18.15
+k8s.gcr.io/kube-controller-manager:v1.18.15
+k8s.gcr.io/kube-scheduler:v1.18.15
+k8s.gcr.io/kube-proxy:v1.18.15
+k8s.gcr.io/pause:3.2
 k8s.gcr.io/etcd:3.4.3-0
-k8s.gcr.io/coredns:1.6.5
-k8s.gcr.io/kube-apiserver:v1.19.3
-k8s.gcr.io/kube-controller-manager:v1.19.3
-k8s.gcr.io/kube-scheduler:v1.19.3
-k8s.gcr.io/kube-proxy:v1.19.3
+k8s.gcr.io/coredns:1.6.7
+k8s.gcr.io/kube-apiserver:v1.20.4
+k8s.gcr.io/kube-controller-manager:v1.20.4
+k8s.gcr.io/kube-scheduler:v1.20.4
+k8s.gcr.io/kube-proxy:v1.20.4
 k8s.gcr.io/pause:3.2
 k8s.gcr.io/etcd:3.4.13-0
-k8s.gcr.io/coredns:1.7.0
+k8s.gcr.io/coredns:1.6.7
 docker.io/weaveworks/weave-npc:2.7.0
 docker.io/weaveworks/weave-kube:2.7.0
 )

diff --git a/examples/footloose/cluster.yaml b/examples/footloose/cluster.yaml
@@ -27,7 +27,7 @@ spec:
     kind: docker
     package: docker-ce
     version: 19.03.8
-  kubernetesVersion: 1.17.5
+  kubernetesVersion: 1.18.15
   os:
     files:
     - destination: /etc/yum.repos.d/kubernetes.repo

diff --git a/examples/footloose/machines.yaml b/examples/footloose/machines.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   clusterName: example
   bootstrap: {}
-  version: 1.17.5
+  version: 1.18.15
   infrastructureRef:
     apiVersion: cluster.weave.works/v1alpha3
     kind: ExistingInfraMachine
@@ -34,7 +34,7 @@ metadata:
 spec:
   clusterName: example
   bootstrap: {}
-  version: 1.17.5
+  version: 1.18.15
   infrastructureRef:
     apiVersion: cluster.weave.works/v1alpha3
     kind: ExistingInfraMachine
@@ -61,7 +61,7 @@ metadata:
 spec:
   clusterName: example
   bootstrap: {}
-  version: 1.17.5
+  version: 1.18.15
   infrastructureRef:
     apiVersion: cluster.weave.works/v1alpha3
     kind: ExistingInfraMachine

diff --git a/go.mod b/go.mod
@@ -7,20 +7,16 @@ require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/dlespiau/kube-test-harness v0.0.0-20200706152414-7c811932d687
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-logr/zapr v0.1.1 // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-jsonnet v0.16.0
-	github.com/googleapis/gnostic v0.4.1 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+	github.com/googleapis/gnostic v0.5.4 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.5.1 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
 	github.com/sirupsen/logrus v1.6.0
-	github.com/spf13/cobra v1.0.0
+	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.6.1
 	github.com/thanhpk/randstr v1.0.4
-	github.com/weaveworks/cluster-api-provider-existinginfra v0.2.1
+	github.com/weaveworks/cluster-api-provider-existinginfra v0.2.4
 	github.com/weaveworks/footloose v0.0.0-20200918140536-ff126705213e
 	github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
 	github.com/weaveworks/launcher v0.0.0-20180824102238-59a4fcc32c9c
@@ -29,12 +25,11 @@ require (
 	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
 	golang.org/x/tools v0.0.0-20200708003708-134513de8882 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
-	google.golang.org/appengine v1.6.5 // indirect
 	gopkg.in/src-d/go-git.v4 v4.13.1
-	k8s.io/api v0.18.6
-	k8s.io/apimachinery v0.18.8
-	k8s.io/client-go v0.18.6
-	k8s.io/kubernetes v1.18.6
+	k8s.io/api v0.20.2
+	k8s.io/apimachinery v0.20.2
+	k8s.io/client-go v0.20.3
+	k8s.io/kubernetes v1.20.2
 	sigs.k8s.io/cluster-api v0.3.6
 	sigs.k8s.io/kustomize/kyaml v0.6.0 // indirect
 	sigs.k8s.io/yaml v1.2.0
@@ -43,30 +38,33 @@ require (
 replace (
 	github.com/appscode/jsonpatch => gomodules.xyz/jsonpatch/v2 v2.0.0+incompatible
 	github.com/docker/docker => github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
-	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.3.0
-	k8s.io/api => k8s.io/api v0.18.5
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.5
-	k8s.io/apimachinery => k8s.io/apimachinery v0.18.5
-	k8s.io/apiserver => k8s.io/apiserver v0.18.5
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.5
-	k8s.io/client-go => k8s.io/client-go v0.18.5
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.5
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.5
-	k8s.io/code-generator => k8s.io/code-generator v0.18.5
-	k8s.io/component-base => k8s.io/component-base v0.18.5
-	k8s.io/cri-api => k8s.io/cri-api v0.18.5
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.5
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.5
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.5
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.5
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.5
-	k8s.io/kubectl => k8s.io/kubectl v0.18.5
-	k8s.io/kubelet => k8s.io/kubelet v0.18.5
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.5
-	k8s.io/metrics => k8s.io/metrics v0.18.5
-	k8s.io/node-api => k8s.io/node-api v0.18.5
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.5
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.5
-	k8s.io/sample-controller => k8s.io/sample-controller v0.18.5
+	github.com/moby/spdystream => github.com/docker/spdystream v0.2.0
+	k8s.io/api => k8s.io/api v0.20.2
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
+	k8s.io/apiserver => k8s.io/apiserver v0.20.2
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
+	k8s.io/client-go => k8s.io/client-go v0.20.2
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
+	k8s.io/code-generator => k8s.io/code-generator v0.20.2
+	k8s.io/component-base => k8s.io/component-base v0.20.2
+	k8s.io/component-helpers => k8s.io/component-helpers v0.20.2
+	k8s.io/controller-manager => k8s.io/controller-manager v0.20.2
+	k8s.io/cri-api => k8s.io/cri-api v0.20.2
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2
+	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210216185858-15cd8face8d6
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2
+	k8s.io/kubectl => k8s.io/kubectl v0.20.2
+	k8s.io/kubelet => k8s.io/kubelet v0.20.2
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2
+	k8s.io/metrics => k8s.io/metrics v0.20.2
+	k8s.io/mount-utils => k8s.io/mount-utils v0.20.2
+	k8s.io/node-api => k8s.io/node-api v0.20.2
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.2
+	k8s.io/sample-controller => k8s.io/sample-controller v0.20.2
 )