From c1723827ce6ae2780bc33ac1b07ba686d6ffe157 Mon Sep 17 00:00:00 2001 From: Nick Santos Date: Fri, 20 May 2022 12:02:55 -0400 Subject: [PATCH] cluster: update kind to v0.14.0 (#225) --- .circleci/Dockerfile | 2 +- .circleci/config.yml | 2 +- go.mod | 4 ++-- go.sum | 6 +++--- hack/Dockerfile | 2 +- pkg/cluster/admin_kind.go | 9 +++++++++ 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile index 6c91af1..58979f8 100644 --- a/.circleci/Dockerfile +++ b/.circleci/Dockerfile @@ -36,7 +36,7 @@ RUN apt install -y apt-transport-https gnupg \ && apt update && apt install -y kubectl # install Kind -ENV KIND_VERSION=v0.13.0 +ENV KIND_VERSION=v0.14.0 RUN set -exu \ && curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64" \ && chmod +x ./kind-linux-amd64 \ diff --git a/.circleci/config.yml b/.circleci/config.yml index 377ba03..279c143 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,7 +54,7 @@ jobs: sudo mv ./minikube-linux-amd64 /usr/local/bin/minikube - run: | set -ex - export KIND_VERSION=v0.13.0 + export KIND_VERSION=v0.14.0 curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64" chmod +x ./kind-linux-amd64 sudo mv ./kind-linux-amd64 /usr/local/bin/kind diff --git a/go.mod b/go.mod index 2fcdc46..a8643b5 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.18 require ( github.com/blang/semver/v4 v4.0.0 github.com/docker/cli v20.10.14+incompatible + github.com/docker/distribution v2.8.1+incompatible github.com/docker/docker v20.10.14+incompatible github.com/docker/go-connections v0.4.0 github.com/google/go-cmp v0.5.7 @@ -27,7 +28,7 @@ require ( k8s.io/cli-runtime v0.23.5 k8s.io/client-go v0.23.5 k8s.io/klog/v2 v2.60.1 - sigs.k8s.io/kind v0.12.0 + sigs.k8s.io/kind v0.14.0 ) require ( @@ -49,7 +50,6 @@ require ( github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/denisbrodbeck/machineid v1.0.1 // indirect - github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.3 // indirect github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect github.com/docker/go-metrics v0.0.1 // indirect diff --git a/go.sum b/go.sum index d510918..b75becd 100644 --- a/go.sum +++ b/go.sum @@ -85,7 +85,7 @@ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbt github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= @@ -1650,8 +1650,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyz sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= -sigs.k8s.io/kind v0.12.0 h1:LFynXwQkH1MrWI8pM1FQty0oUwEKjU5EkMaVZaPld8E= -sigs.k8s.io/kind v0.12.0/go.mod h1:EcgDSBVxz8Bvm19fx8xkioFrf9dC30fMJdOTXBSGNoM= +sigs.k8s.io/kind v0.14.0 h1:cNmI3jGBvp7UegEGbC5we8plDtCUmaNRL+bod7JoSCE= +sigs.k8s.io/kind v0.14.0/go.mod h1:UrFRPHG+2a5j0Q7qiR4gtJ4rEyn8TuMQwuOPf+m4oHg= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= sigs.k8s.io/kustomize/api v0.10.1/go.mod h1:2FigT1QN6xKdcnGS2Ppp1uIWrtWN28Ms8A3OZUZhwr8= sigs.k8s.io/kustomize/api v0.11.4 h1:/0Mr3kfBBNcNPOW5Qwk/3eb8zkswCwnqQxxKtmrTkRo= diff --git a/hack/Dockerfile b/hack/Dockerfile index 8f93310..ddc7cd1 100644 --- a/hack/Dockerfile +++ b/hack/Dockerfile @@ -37,7 +37,7 @@ RUN apt install -y apt-transport-https gnupg \ && apt update && apt install -y kubectl # install Kind -ENV KIND_VERSION=v0.13.0 +ENV KIND_VERSION=v0.14.0 RUN set -exu \ && curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64" \ && chmod +x ./kind-linux-amd64 \ diff --git a/pkg/cluster/admin_kind.go b/pkg/cluster/admin_kind.go index 8b44656..fb8104b 100644 --- a/pkg/cluster/admin_kind.go +++ b/pkg/cluster/admin_kind.go @@ -198,6 +198,15 @@ func (a *kindAdmin) getKindVersion(ctx context.Context) (string, error) { // This table must be built up manually from the Kind release notes each // time a new Kind version is released :\ var kindK8sNodeTable = map[string]map[string]string{ + "v0.14.0": map[string]string{ + "1.24": "kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e", + "1.23": "kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae", + "1.22": "kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105", + "1.21": "kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207", + "1.20": "kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248", + "1.19": "kindest/node:v1.19.16@sha256:d9c819e8668de8d5030708e484a9fdff44d95ec4675d136ef0a0a584e587f65c", + "1.18": "kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fcdbd126188e6d7", + }, "v0.13.0": map[string]string{ "1.24": "kindest/node:v1.24.0@sha256:406fd86d48eaf4c04c7280cd1d2ca1d61e7d0d61ddef0125cb097bc7b82ed6a1", "1.23": "kindest/node:v1.23.6@sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355",