From abf7c6a0415c916559e8e429732f9c0c4773b650 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 01:35:40 +0000 Subject: [PATCH] Bump sigs.k8s.io/kind from 0.13.0 to 0.14.0 Bumps [sigs.k8s.io/kind](https://github.com/kubernetes-sigs/kind) from 0.13.0 to 0.14.0. - [Release notes](https://github.com/kubernetes-sigs/kind/releases) - [Commits](https://github.com/kubernetes-sigs/kind/compare/v0.13.0...v0.14.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/kind dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../kind/pkg/apis/config/defaults/image.go | 2 +- .../create/actions/kubeadminit/init.go | 13 +++++++--- .../actions/waitforready/waitforready.go | 2 +- .../pkg/cluster/internal/kubeadm/config.go | 24 +++++-------------- .../cluster/internal/loadbalancer/const.go | 2 +- .../kind/pkg/cluster/nodeutils/util.go | 2 +- .../kind/pkg/cmd/kind/version/version.go | 2 +- 10 files changed, 25 insertions(+), 30 deletions(-) diff --git a/go.mod b/go.mod index 637472b985..16cc84c7b1 100644 --- a/go.mod +++ b/go.mod @@ -24,5 +24,5 @@ require ( golang.org/x/tools v0.1.10 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b k8s.io/apimachinery v0.24.0 - sigs.k8s.io/kind v0.13.0 + sigs.k8s.io/kind v0.14.0 ) diff --git a/go.sum b/go.sum index ad925c1efe..cc50b81012 100644 --- a/go.sum +++ b/go.sum @@ -2903,8 +2903,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= -sigs.k8s.io/kind v0.13.0 h1:hXcTJAst3MVGnxs8ZEg+II9bsL+st8sTE5c0Jz5APpY= -sigs.k8s.io/kind v0.13.0/go.mod h1:UrFRPHG+2a5j0Q7qiR4gtJ4rEyn8TuMQwuOPf+m4oHg= +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/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= diff --git a/vendor/modules.txt b/vendor/modules.txt index 93cad0c16b..8ba028c916 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -444,7 +444,7 @@ k8s.io/klog/v2/internal/severity k8s.io/utils/internal/third_party/forked/golang/net k8s.io/utils/net k8s.io/utils/strings/slices -# sigs.k8s.io/kind v0.13.0 +# sigs.k8s.io/kind v0.14.0 ## explicit sigs.k8s.io/kind/pkg/apis/config/defaults sigs.k8s.io/kind/pkg/apis/config/v1alpha4 diff --git a/vendor/sigs.k8s.io/kind/pkg/apis/config/defaults/image.go b/vendor/sigs.k8s.io/kind/pkg/apis/config/defaults/image.go index 60dd476656..6255777646 100644 --- a/vendor/sigs.k8s.io/kind/pkg/apis/config/defaults/image.go +++ b/vendor/sigs.k8s.io/kind/pkg/apis/config/defaults/image.go @@ -18,4 +18,4 @@ limitations under the License. package defaults // Image is the default for the Config.Image field, aka the default node image. -const Image = "kindest/node:v1.24.0@sha256:406fd86d48eaf4c04c7280cd1d2ca1d61e7d0d61ddef0125cb097bc7b82ed6a1" +const Image = "kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e" diff --git a/vendor/sigs.k8s.io/kind/pkg/cluster/internal/create/actions/kubeadminit/init.go b/vendor/sigs.k8s.io/kind/pkg/cluster/internal/create/actions/kubeadminit/init.go index 5d96dc8bb6..cc587940e2 100644 --- a/vendor/sigs.k8s.io/kind/pkg/cluster/internal/create/actions/kubeadminit/init.go +++ b/vendor/sigs.k8s.io/kind/pkg/cluster/internal/create/actions/kubeadminit/init.go @@ -111,7 +111,7 @@ func (a *action) Execute(ctx *actions.ActionContext) error { // https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/#master-isolation if len(allNodes) == 1 { // TODO: Once kubeadm 1.23 is no longer supported remove the <1.24 handling. - // TODO: Remove only the "control-plane" taint for kubeadm >= 1.25. + // TODO: Once kubeadm 1.24 is no longer supported remove the <1.25 handling. // https://github.com/kubernetes-sigs/kind/issues/1699 rawVersion, err := nodeutils.KubeVersion(node) if err != nil { @@ -121,9 +121,16 @@ func (a *action) Execute(ctx *actions.ActionContext) error { if err != nil { return errors.Wrap(err, "could not parse Kubernetes version") } - taints := []string{"node-role.kubernetes.io/control-plane-", "node-role.kubernetes.io/master-"} - if kubeVersion.LessThan(version.MustParseSemantic("v1.24.0-0")) { + var taints []string + if kubeVersion.LessThan(version.MustParseSemantic("v1.24.0-alpha.1.592+370031cadac624")) { + // for versions older than 1.24 prerelease remove only the old taint taints = []string{"node-role.kubernetes.io/master-"} + } else if kubeVersion.LessThan(version.MustParseSemantic("v1.25.0-alpha.0.557+84c8afeba39ec9")) { + // for versions between 1.24 and 1.25 prerelease remove both the old and new taint + taints = []string{"node-role.kubernetes.io/control-plane-", "node-role.kubernetes.io/master-"} + } else { + // for any newer version only remove the new taint + taints = []string{"node-role.kubernetes.io/control-plane-"} } taintArgs := []string{"--kubeconfig=/etc/kubernetes/admin.conf", "taint", "nodes", "--all"} taintArgs = append(taintArgs, taints...) diff --git a/vendor/sigs.k8s.io/kind/pkg/cluster/internal/create/actions/waitforready/waitforready.go b/vendor/sigs.k8s.io/kind/pkg/cluster/internal/create/actions/waitforready/waitforready.go index 59348a9059..e6c03e54cd 100644 --- a/vendor/sigs.k8s.io/kind/pkg/cluster/internal/create/actions/waitforready/waitforready.go +++ b/vendor/sigs.k8s.io/kind/pkg/cluster/internal/create/actions/waitforready/waitforready.go @@ -80,7 +80,7 @@ func (a *Action) Execute(ctx *actions.ActionContext) error { return errors.Wrap(err, "could not parse Kubernetes version") } selectorLabel := "node-role.kubernetes.io/control-plane" - if kubeVersion.LessThan(version.MustParseSemantic("v1.24.0")) { + if kubeVersion.LessThan(version.MustParseSemantic("v1.24.0-alpha.1.591+a3d5e5598290df")) { selectorLabel = "node-role.kubernetes.io/master" } diff --git a/vendor/sigs.k8s.io/kind/pkg/cluster/internal/kubeadm/config.go b/vendor/sigs.k8s.io/kind/pkg/cluster/internal/kubeadm/config.go index 2204f85ccf..ca324d49b0 100644 --- a/vendor/sigs.k8s.io/kind/pkg/cluster/internal/kubeadm/config.go +++ b/vendor/sigs.k8s.io/kind/pkg/cluster/internal/kubeadm/config.go @@ -219,7 +219,6 @@ localAPIEndpoint: nodeRegistration: criSocket: "/run/containerd/containerd.sock" kubeletExtraArgs: - fail-swap-on: "false" node-ip: "{{ .NodeAddress }}" provider-id: "kind://{{.NodeProvider}}/{{.ClusterName}}/{{.NodeName}}" --- @@ -237,7 +236,6 @@ controlPlane: nodeRegistration: criSocket: "/run/containerd/containerd.sock" kubeletExtraArgs: - fail-swap-on: "false" node-ip: "{{ .NodeAddress }}" provider-id: "kind://{{.NodeProvider}}/{{.ClusterName}}/{{.NodeName}}" discovery: @@ -250,11 +248,9 @@ apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration metadata: name: config -# explicitly set default cgroup driver -# unblocks https://github.com/kubernetes/kubernetes/pull/99471 -# TODO: consider switching to systemd instead -# tracked in: https://github.com/kubernetes-sigs/kind/issues/1726 cgroupDriver: {{ .CgroupDriver }} +cgroupRoot: /kubelet +failSwapOn: false # configure ipv6 addresses in IPv6 mode {{ if .IPv6 -}} address: "::" @@ -353,7 +349,6 @@ localAPIEndpoint: nodeRegistration: criSocket: "unix:///run/containerd/containerd.sock" kubeletExtraArgs: - fail-swap-on: "false" node-ip: "{{ .NodeAddress }}" provider-id: "kind://{{.NodeProvider}}/{{.ClusterName}}/{{.NodeName}}" node-labels: "{{ .NodeLabels }}" @@ -372,7 +367,6 @@ controlPlane: nodeRegistration: criSocket: "unix:///run/containerd/containerd.sock" kubeletExtraArgs: - fail-swap-on: "false" node-ip: "{{ .NodeAddress }}" provider-id: "kind://{{.NodeProvider}}/{{.ClusterName}}/{{.NodeName}}" node-labels: "{{ .NodeLabels }}" @@ -386,11 +380,9 @@ apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration metadata: name: config -# explicitly set default cgroup driver -# unblocks https://github.com/kubernetes/kubernetes/pull/99471 -# TODO: consider switching to systemd instead -# tracked in: https://github.com/kubernetes-sigs/kind/issues/1726 cgroupDriver: {{ .CgroupDriver }} +cgroupRoot: /kubelet +failSwapOn: false # configure ipv6 addresses in IPv6 mode {{ if .IPv6 -}} address: "::" @@ -494,7 +486,6 @@ localAPIEndpoint: nodeRegistration: criSocket: "unix:///run/containerd/containerd.sock" kubeletExtraArgs: - fail-swap-on: "false" node-ip: "{{ .NodeAddress }}" provider-id: "kind://{{.NodeProvider}}/{{.ClusterName}}/{{.NodeName}}" node-labels: "{{ .NodeLabels }}" @@ -513,7 +504,6 @@ controlPlane: nodeRegistration: criSocket: "unix:///run/containerd/containerd.sock" kubeletExtraArgs: - fail-swap-on: "false" node-ip: "{{ .NodeAddress }}" provider-id: "kind://{{.NodeProvider}}/{{.ClusterName}}/{{.NodeName}}" node-labels: "{{ .NodeLabels }}" @@ -527,11 +517,9 @@ apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration metadata: name: config -# explicitly set default cgroup driver -# unblocks https://github.com/kubernetes/kubernetes/pull/99471 -# TODO: consider switching to systemd instead -# tracked in: https://github.com/kubernetes-sigs/kind/issues/1726 cgroupDriver: {{ .CgroupDriver }} +cgroupRoot: /kubelet +failSwapOn: false # configure ipv6 addresses in IPv6 mode {{ if .IPv6 -}} address: "::" diff --git a/vendor/sigs.k8s.io/kind/pkg/cluster/internal/loadbalancer/const.go b/vendor/sigs.k8s.io/kind/pkg/cluster/internal/loadbalancer/const.go index fdee3efcbe..79302d3b5d 100644 --- a/vendor/sigs.k8s.io/kind/pkg/cluster/internal/loadbalancer/const.go +++ b/vendor/sigs.k8s.io/kind/pkg/cluster/internal/loadbalancer/const.go @@ -17,7 +17,7 @@ limitations under the License. package loadbalancer // Image defines the loadbalancer image:tag -const Image = "kindest/haproxy:v20220207-ca68f7d4" +const Image = "kindest/haproxy:v20220510-a42b3ea0" // ConfigPath defines the path to the config file in the image const ConfigPath = "/usr/local/etc/haproxy/haproxy.cfg" diff --git a/vendor/sigs.k8s.io/kind/pkg/cluster/nodeutils/util.go b/vendor/sigs.k8s.io/kind/pkg/cluster/nodeutils/util.go index 59c5211aaa..5a7d433e0d 100644 --- a/vendor/sigs.k8s.io/kind/pkg/cluster/nodeutils/util.go +++ b/vendor/sigs.k8s.io/kind/pkg/cluster/nodeutils/util.go @@ -82,7 +82,7 @@ func LoadImageArchive(n nodes.Node, image io.Reader) error { if err != nil { return err } - cmd := n.Command("ctr", "--namespace=k8s.io", "images", "import", "--snapshotter", snapshotter, "-").SetStdin(image) + cmd := n.Command("ctr", "--namespace=k8s.io", "images", "import", "--digests", "--snapshotter="+snapshotter, "-").SetStdin(image) if err := cmd.Run(); err != nil { return errors.Wrap(err, "failed to load image") } diff --git a/vendor/sigs.k8s.io/kind/pkg/cmd/kind/version/version.go b/vendor/sigs.k8s.io/kind/pkg/cmd/kind/version/version.go index 81611029e6..d83c20ea6f 100644 --- a/vendor/sigs.k8s.io/kind/pkg/cmd/kind/version/version.go +++ b/vendor/sigs.k8s.io/kind/pkg/cmd/kind/version/version.go @@ -50,7 +50,7 @@ func DisplayVersion() string { } // VersionCore is the core portion of the kind CLI version per Semantic Versioning 2.0.0 -const VersionCore = "0.13.0" +const VersionCore = "0.14.0" // VersionPreRelease is the pre-release portion of the kind CLI version per // Semantic Versioning 2.0.0