diff --git a/go.mod b/go.mod index 607901eeba..f810a0e265 100644 --- a/go.mod +++ b/go.mod @@ -23,5 +23,5 @@ require ( golang.org/x/tools v0.1.12 gopkg.in/yaml.v3 v3.0.1 k8s.io/apimachinery v0.25.2 - sigs.k8s.io/kind v0.15.0 + sigs.k8s.io/kind v0.16.0 ) diff --git a/go.sum b/go.sum index 0227abcfa3..bd60318574 100644 --- a/go.sum +++ b/go.sum @@ -3366,8 +3366,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/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/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/kind v0.15.0 h1:Fskj234L4hjQlsScCgeYvCBIRt06cjLzc7+kbr1u8Tg= -sigs.k8s.io/kind v0.15.0/go.mod h1:cKTqagdRyUQmihhBOd+7p43DpOPRn9rHsUC08K1Jbsk= +sigs.k8s.io/kind v0.16.0 h1:GFXyyxtPnHFKqXr3ZG8/X0+0K9sl69lejStlPn2WQyM= +sigs.k8s.io/kind v0.16.0/go.mod h1:cKTqagdRyUQmihhBOd+7p43DpOPRn9rHsUC08K1Jbsk= sigs.k8s.io/release-utils v0.7.3/go.mod h1:n0mVez/1PZYZaZUTJmxewxH3RJ/Lf7JUDh7TG1CASOE= 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= diff --git a/vendor/modules.txt b/vendor/modules.txt index b338df1abf..d4d4f89674 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -588,7 +588,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.15.0 +# sigs.k8s.io/kind v0.16.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 36edced1cf..33354ac681 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.25.0@sha256:428aaa17ec82ccde0131cb2d1ca6547d13cf5fdabcc0bbecf749baa935387cbf" +const Image = "kindest/node:v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace" 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 7e846d7675..a45d9ff2a3 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 @@ -163,133 +163,6 @@ func (c *ConfigData) Derive() { // EG: // https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1 -// ConfigTemplateBetaV1 is the kubeadm config template for API version v1beta1 -const ConfigTemplateBetaV1 = `# config generated by kind -apiVersion: kubeadm.k8s.io/v1beta1 -kind: ClusterConfiguration -metadata: - name: config -kubernetesVersion: {{.KubernetesVersion}} -clusterName: "{{.ClusterName}}" -controlPlaneEndpoint: "{{ .ControlPlaneEndpoint }}" -# on docker for mac we have to expose the api server via port forward, -# so we need to ensure the cert is valid for localhost so we can talk -# to the cluster after rewriting the kubeconfig to point to localhost -apiServer: - certSANs: [localhost, "{{.APIServerAddress}}"] - extraArgs: - "runtime-config": "{{ .RuntimeConfigString }}" -{{ if .FeatureGates }} - "feature-gates": "{{ .FeatureGatesString }}" -{{ end}} -controllerManager: -{{ if .FeatureGates }} - extraArgs: - "feature-gates": "{{ .FeatureGatesString }}" -{{ end}} - enable-hostpath-provisioner: "true" - # configure ipv6 default addresses for IPv6 clusters - {{ if .IPv6 -}} - bind-address: "::" - {{- end }} -scheduler: - extraArgs: -{{ if .FeatureGates }} - "feature-gates": "{{ .FeatureGatesString }}" -{{ end }} - # configure ipv6 default addresses for IPv6 clusters - {{ if .IPv6 -}} - address: "::" - bind-address: "::1" - {{- end }} -networking: - podSubnet: "{{ .PodSubnet }}" - serviceSubnet: "{{ .ServiceSubnet }}" ---- -apiVersion: kubeadm.k8s.io/v1beta1 -kind: InitConfiguration -metadata: - name: config -# we use a well know token for TLS bootstrap -bootstrapTokens: -- token: "{{ .Token }}" -# we use a well know port for making the API server discoverable inside docker network. -# from the host machine such port will be accessible via a random local port instead. -localAPIEndpoint: - advertiseAddress: "{{ .AdvertiseAddress }}" - bindPort: {{.APIBindPort}} -nodeRegistration: - criSocket: "/run/containerd/containerd.sock" - kubeletExtraArgs: - node-ip: "{{ .NodeAddress }}" - provider-id: "kind://{{.NodeProvider}}/{{.ClusterName}}/{{.NodeName}}" ---- -# no-op entry that exists solely so it can be patched -apiVersion: kubeadm.k8s.io/v1beta1 -kind: JoinConfiguration -metadata: - name: config -{{ if .ControlPlane -}} -controlPlane: - localAPIEndpoint: - advertiseAddress: "{{ .AdvertiseAddress }}" - bindPort: {{.APIBindPort}} -{{- end }} -nodeRegistration: - criSocket: "/run/containerd/containerd.sock" - kubeletExtraArgs: - node-ip: "{{ .NodeAddress }}" - provider-id: "kind://{{.NodeProvider}}/{{.ClusterName}}/{{.NodeName}}" -discovery: - bootstrapToken: - apiServerEndpoint: "{{ .ControlPlaneEndpoint }}" - token: "{{ .Token }}" - unsafeSkipCAVerification: true ---- -apiVersion: kubelet.config.k8s.io/v1beta1 -kind: KubeletConfiguration -metadata: - name: config -cgroupDriver: {{ .CgroupDriver }} -cgroupRoot: /kubelet -failSwapOn: false -# configure ipv6 addresses in IPv6 mode -{{ if .IPv6 -}} -address: "::" -healthzBindAddress: "::" -{{- end }} -# disable disk resource management by default -# kubelet will see the host disk that the inner container runtime -# is ultimately backed by and attempt to recover disk space. we don't want that. -imageGCHighThresholdPercent: 100 -evictionHard: - nodefs.available: "0%" - nodefs.inodesFree: "0%" - imagefs.available: "0%" -{{if .FeatureGates}}featureGates: -{{ range $key := .SortedFeatureGateKeys }} - "{{ $key }}": {{index $.FeatureGates $key }} -{{end}}{{end}} -{{if ne .KubeProxyMode "None"}} ---- -apiVersion: kubeproxy.config.k8s.io/v1alpha1 -kind: KubeProxyConfiguration -metadata: - name: config -mode: "{{ .KubeProxyMode }}" -{{if .FeatureGates}}featureGates: -{{ range $key := .SortedFeatureGateKeys }} - "{{ $key }}": {{ index $.FeatureGates $key }} -{{end}}{{end}} -iptables: - minSyncPeriod: 1s -conntrack: -# Skip setting sysctl value "net.netfilter.nf_conntrack_max" -# It is a global variable that affects other namespaces - maxPerCore: 0 -{{end}} -` - // ConfigTemplateBetaV2 is the kubeadm config template for API version v1beta2 const ConfigTemplateBetaV2 = `# config generated by kind apiVersion: kubeadm.k8s.io/v1beta2 @@ -599,9 +472,7 @@ func Config(data ConfigData) (config string, err error) { // assume the latest API version, then fallback if the k8s version is too low templateSource := ConfigTemplateBetaV3 - if ver.LessThan(version.MustParseSemantic("v1.15.0")) { - templateSource = ConfigTemplateBetaV1 - } else if ver.LessThan(version.MustParseSemantic("v1.23.0")) { + if ver.LessThan(version.MustParseSemantic("v1.23.0")) { templateSource = ConfigTemplateBetaV2 } diff --git a/vendor/sigs.k8s.io/kind/pkg/cluster/internal/providers/podman/network.go b/vendor/sigs.k8s.io/kind/pkg/cluster/internal/providers/podman/network.go index 87d7e6679e..2f67f75df4 100644 --- a/vendor/sigs.k8s.io/kind/pkg/cluster/internal/providers/podman/network.go +++ b/vendor/sigs.k8s.io/kind/pkg/cluster/internal/providers/podman/network.go @@ -109,9 +109,13 @@ func isUnknownIPv6FlagError(err error) bool { func isPoolOverlapError(err error) bool { rerr := exec.RunErrorForError(err) - return rerr != nil && - (strings.Contains(string(rerr.Output), "is being used by a network interface") || - strings.Contains(string(rerr.Output), "is already being used by a cni configuration")) + if rerr == nil { + return false + } + output := string(rerr.Output) + return strings.Contains(output, "is already used on the host or by another config") || + strings.Contains(output, "is being used by a network interface") || + strings.Contains(output, "is already being used by a cni configuration") } // generateULASubnetFromName generate an IPv6 subnet based on the 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 c400ef753b..c1a230a7db 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 @@ -54,7 +54,7 @@ func DisplayVersion() string { } // versionCore is the core portion of the kind CLI version per Semantic Versioning 2.0.0 -const versionCore = "0.15.0" +const versionCore = "0.16.0" // versionPreRelease is the base pre-release portion of the kind CLI version per // Semantic Versioning 2.0.0