Bump kind to v0.20.0

UPSTREAM_PROJECTS.yaml

@@ -161,7 +161,7 @@ projects:
           - tag: v0.1.16
       - name: kind
         versions:
-          - tag: v0.18.0
+          - tag: v0.20.0
   - org: metallb
     repos:
       - name: metallb

build/lib/common.sh

@@ -413,3 +413,23 @@ function build::jq::update_in_place() {
 
   cat $json_file | jq -S ''"$jq_query"'' > $json_file.tmp && mv $json_file.tmp $json_file
 }
+
+function build::common::copy_if_source_destination_different() {
+  local source=$1
+  local destination=$2
+
+  source_inode=$(stat -c %i $source)
+  destination_inode=""
+  if [ -d $destination ] && [ -e $destination/$(basename $source) ]; then
+    destination_inode=$(stat -c %i $destination/$(basename $source))
+  elif [ -f $destination ] && [ -e $destination ]; then
+    destination_inode=$(stat -c %i $destination)
+  fi
+
+  if [ -n "$destination_inode" ] && [ "$source_inode" = "$destination_inode" ]; then
+    echo "Source and destination are the same file"
+    exit 0
+  fi
+
+  cp -rf $source $destination
+}

build/lib/simple_create_tarballs.sh

@@ -41,10 +41,10 @@ function build::simple::tarball() {
     TAR_FILE="${TAR_FILE_PREFIX}-${OS}-${ARCH}-${TAG}.tar.gz"
 
     for path in "${LICENSE_PATHS[@]}"; do
-      build::common::echo_and_run cp -rf $path ${OUTPUT_BIN_DIR}/${OS}-${ARCH}/
+      build::common::echo_and_run build::common::copy_if_source_destination_different $path ${OUTPUT_BIN_DIR}/${OS}-${ARCH}/
     done
     for path in "${ATTRIBUTION_PATHS[@]}"; do
-      build::common::echo_and_run cp $path ${OUTPUT_BIN_DIR}/${OS}-${ARCH}/
+      build::common::echo_and_run build::common::copy_if_source_destination_different $path ${OUTPUT_BIN_DIR}/${OS}-${ARCH}/
     done
     build::common::create_tarball ${TAR_PATH}/${TAR_FILE} ${OUTPUT_BIN_DIR}/${OS}-${ARCH} .
   done

projects/kubernetes-sigs/kind/ATTRIBUTION.txt

@@ -11,7 +11,7 @@ https://github.com/spf13/cobra
 ** gopkg.in/yaml.v2; version v2.4.0 --
 https://gopkg.in/yaml.v2
 
-** sigs.k8s.io/kind; version v0.18.0 --
+** sigs.k8s.io/kind; version v0.20.0 --
 https://github.com/kubernetes-sigs/kind
 
 

projects/kubernetes-sigs/kind/CHECKSUMS

@@ -1,4 +1,4 @@
-5c192440c2870a7ff1810237503f3950853dbdf07a6057bb8d57e3040289ef7c  _output/bin/kind/linux-amd64/kind
-62344b893805da524e129c820b982574a04f84e35aaf98a5f4718c9f8a6edc65  _output/bin/kind/linux-amd64/kindnetd
-1061c140a1c85e3adba725bfb570366fb21a1642ba066ed8772a8abd5c29aba9  _output/bin/kind/linux-arm64/kind
-54a7a42aca5dc73a7909292e82ca801baa7d4715d14af6fdeefb4c18d4c334e1  _output/bin/kind/linux-arm64/kindnetd
+3c96ee2d0830dd57621252926a6a76808f68ab095c26cda5d296de98e9379a3f  _output/bin/kind/linux-amd64/kind
+351468bf65fec0420a9f816c9bc95bf0e86d3ac22ed8b949ebcf35767d9397c9  _output/bin/kind/linux-amd64/kindnetd
+25714507fc3014ad5103707699e5fc5646183fd099b93f7a695bcf8b5f9ce883  _output/bin/kind/linux-arm64/kind
+af06529a9f2d46e19bd7bf611b83d3e37cd035bbd2699c58562d4f47458528b3  _output/bin/kind/linux-arm64/kindnetd

projects/kubernetes-sigs/kind/GIT_TAG

@@ -1 +1 @@
-v0.18.0
+v0.20.0

projects/kubernetes-sigs/kind/KINDNETD_ATTRIBUTION.txt

@@ -59,7 +59,7 @@ https://github.com/kubernetes/utils
 ** sigs.k8s.io/json; version v0.0.0-20220713155537-f223a00ba0e2 --
 https://github.com/kubernetes-sigs/json
 
-** sigs.k8s.io/kind/images/kindnetd/cmd/kindnetd; version v0.18.0 --
+** sigs.k8s.io/kind/images/kindnetd/cmd/kindnetd; version v0.20.0 --
 https://github.com/kubernetes-sigs/kind
 
 ** sigs.k8s.io/structured-merge-diff/v4; version v4.2.3 --

projects/kubernetes-sigs/kind/README.md

@@ -1,5 +1,5 @@
 ## **Kind**
-![Version](https://img.shields.io/badge/version-v0.18.0-blue)
+![Version](https://img.shields.io/badge/version-v0.20.0-blue)
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiVkgvQm93WHUvUWJ1U2ZhSG9JTUJNMFdjdGtwSkIyRCt1azM0THYxcWYweC8rM2lHRmNYMXI0QkVPUm4yZ0JZZ1c4RzdMeTJ3dGtpREdYeFpvTEhtc2FnPSIsIml2UGFyYW1ldGVyU3BlYyI6Im9GV2EzRGZQNVZ5c25kTmoiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
 
 [Kind](https://github.com/kubernetes-sigs/kind) is a tool for running local Kubernetes clusters using Docker container "nodes". kind bootstraps each "node" with `kubeadm`. kind consists of:

projects/kubernetes-sigs/kind/patches/0002-skip-ctr-pulling-required-images-since-the-build-rem.patch

@@ -1,19 +1,19 @@
-From 2a6b966caf858c5683660b644b7c2ee914e4e533 Mon Sep 17 00:00:00 2001
+From 314187ac127a4e8a190e62b9788a7940efbbb6f0 Mon Sep 17 00:00:00 2001
 From: Jackson West <jgw@amazon.com>
 Date: Sat, 2 Apr 2022 22:01:04 -0500
-Subject: [PATCH 2/2] skip ctr pulling required images since the build removes
+Subject: [PATCH 2/3] skip ctr pulling required images since the build removes
  them anyway
 
 Signed-off-by: Jackson West <jgw@amazon.com>
 ---
- pkg/build/nodeimage/buildcontext.go | 48 +++++++++++++++--------------
- 1 file changed, 25 insertions(+), 23 deletions(-)
+ pkg/build/nodeimage/buildcontext.go | 36 +++++++++++++++--------------
+ 1 file changed, 19 insertions(+), 17 deletions(-)
 
 diff --git a/pkg/build/nodeimage/buildcontext.go b/pkg/build/nodeimage/buildcontext.go
-index ecbaf6b1..6922a23a 100644
+index fed540dc..7815c87f 100644
 --- a/pkg/build/nodeimage/buildcontext.go
 +++ b/pkg/build/nodeimage/buildcontext.go
-@@ -257,29 +257,31 @@ func (c *buildContext) prePullImagesAndWriteManifests(bits kube.Bits, parsedVers
+@@ -258,23 +258,25 @@ func (c *buildContext) prePullImagesAndWriteManifests(bits kube.Bits, parsedVers
  		}
  	}()
 
@@ -22,17 +22,11 @@ index ecbaf6b1..6922a23a 100644
 -		image := image // https://golang.org/doc/faq#closures_and_goroutines
 -		fns = append(fns, func() error {
 -			if !builtImages.Has(image) {
--				/*
--					TODO: show errors when we have real errors. See comments in
--					importer implementation
--					err := importer.Pull(image, dockerBuildOsAndArch(c.arch))
--					if err != nil {
--						c.logger.Warnf("Failed to pull %s with error: %v", image, err)
--						runE := exec.RunErrorForError(err)
--						c.logger.Warn(string(runE.Output))
--					}
--				*/
--				_ = importer.Pull(image, dockerBuildOsAndArch(c.arch))
+-				if err = importer.Pull(image, dockerBuildOsAndArch(c.arch)); err != nil {
+-					c.logger.Warnf("Failed to pull %s with error: %v", image, err)
+-					runE := exec.RunErrorForError(err)
+-					c.logger.Warn(string(runE.Output))
+-				}
 -			}
 -			return nil
 -		})
@@ -47,17 +41,11 @@ index ecbaf6b1..6922a23a 100644
 +	// 	image := image // https://golang.org/doc/faq#closures_and_goroutines
 +	// 	fns = append(fns, func() error {
 +	// 		if !builtImages.Has(image) {
-+	// 			/*
-+	// 				TODO: show errors when we have real errors. See comments in
-+	// 				importer implementation
-+	// 				err := importer.Pull(image, dockerBuildOsAndArch(c.arch))
-+	// 				if err != nil {
-+	// 					c.logger.Warnf("Failed to pull %s with error: %v", image, err)
-+	// 					runE := exec.RunErrorForError(err)
-+	// 					c.logger.Warn(string(runE.Output))
-+	// 				}
-+	// 			*/
-+	// 			_ = importer.Pull(image, dockerBuildOsAndArch(c.arch))
++	// 			if err = importer.Pull(image, dockerBuildOsAndArch(c.arch)); err != nil {
++	// 				c.logger.Warnf("Failed to pull %s with error: %v", image, err)
++	// 				runE := exec.RunErrorForError(err)
++	// 				c.logger.Warn(string(runE.Output))
++	// 			}
 +	// 		}
 +	// 		return nil
 +	// 	})

projects/kubernetes-sigs/kind/patches/0003-Patch-haproxy-maxconn-value-to-avoid-ulimit-issue.patch

@@ -1,12 +1,11 @@
-From bc76a1b60451aa3df5bf85b37009eb298de86a2b Mon Sep 17 00:00:00 2001
-From: Prow Bot <prow@amazonaws.com>
+From 00c9ce28d95941e4d555f2ace4a0eb3bc15d01a7 Mon Sep 17 00:00:00 2001
+From: Jackson West <jgw@amazon.com>
 Date: Wed, 19 Apr 2023 12:28:28 -0500
 Subject: [PATCH 3/3] Patch haproxy maxconn value to avoid ulimit issue
 
 EKS-A uses haproxy 2.5 which errors if the maxconn value
 requires more FDs than allowed by the ulimit setting of docker.
 100k maxconn is too high for the default ulimit on an al2 node.
-
 ---
  images/haproxy/haproxy.cfg                  | 5 ++++-
  pkg/cluster/internal/loadbalancer/config.go | 5 ++++-