Revert "Bump cluster-api, cert-manager and kind to latest versions. (a…

…ws#2273)" This reverts commit c884b66.
abhay-krishna · Jun 30, 2023 · 37159ba · 37159ba
1 parent 6c3ece4
commit 37159ba
Show file tree

Hide file tree

Showing 27 changed files with 273 additions and 358 deletions.
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -53,7 +53,7 @@ projects:
     repos:
       - name: cert-manager
         versions:
-          - tag: v1.12.2
+          - tag: v1.12.1
   - org: cilium
     repos:
       - name: cilium
@@ -143,7 +143,7 @@ projects:
     repos:
       - name: cluster-api
         versions:
-          - tag: v1.4.4
+          - tag: v1.4.3
       - name: cluster-api-provider-cloudstack
         versions:
           - tag: v0.4.9-rc5
@@ -161,7 +161,7 @@ projects:
           - tag: v0.1.16
       - name: kind
         versions:
-          - tag: v0.20.0
+          - tag: v0.18.0
   - org: metallb
     repos:
       - name: metallb

diff --git a/build/lib/common.sh b/build/lib/common.sh
@@ -413,23 +413,3 @@ 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
-}
diff --git a/build/lib/simple_create_tarballs.sh b/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 build::common::copy_if_source_destination_different $path ${OUTPUT_BIN_DIR}/${OS}-${ARCH}/
+      build::common::echo_and_run cp -rf $path ${OUTPUT_BIN_DIR}/${OS}-${ARCH}/
     done
     for path in "${ATTRIBUTION_PATHS[@]}"; do
-      build::common::echo_and_run build::common::copy_if_source_destination_different $path ${OUTPUT_BIN_DIR}/${OS}-${ARCH}/
+      build::common::echo_and_run cp $path ${OUTPUT_BIN_DIR}/${OS}-${ARCH}/
     done
     build::common::create_tarball ${TAR_PATH}/${TAR_FILE} ${OUTPUT_BIN_DIR}/${OS}-${ARCH} .
   done

diff --git a/projects/cert-manager/cert-manager/CERT_MANAGER_ACMESOLVER_ATTRIBUTION.txt b/projects/cert-manager/cert-manager/CERT_MANAGER_ACMESOLVER_ATTRIBUTION.txt
@@ -2,7 +2,7 @@
 ** github.com/cert-manager/cert-manager; version v0.0.0-00010101000000-000000000000 --
 https://github.com/cert-manager/cert-manager
 
-** github.com/cert-manager/cert-manager/acmesolver-binary; version v1.12.2 --
+** github.com/cert-manager/cert-manager/acmesolver-binary; version v1.12.1 --
 https://github.com/cert-manager/cert-manager/acmesolver-binary
 
 ** github.com/go-logr/logr; version v1.2.4 --

diff --git a/projects/cert-manager/cert-manager/CERT_MANAGER_CAINJECTOR_ATTRIBUTION.txt b/projects/cert-manager/cert-manager/CERT_MANAGER_CAINJECTOR_ATTRIBUTION.txt
@@ -2,7 +2,7 @@
 ** github.com/cert-manager/cert-manager; version v0.0.0-00010101000000-000000000000 --
 https://github.com/cert-manager/cert-manager
 
-** github.com/cert-manager/cert-manager/cainjector-binary; version v1.12.2 --
+** github.com/cert-manager/cert-manager/cainjector-binary; version v1.12.1 --
 https://github.com/cert-manager/cert-manager/cainjector-binary
 
 ** github.com/go-logr/logr; version v1.2.4 --

diff --git a/projects/cert-manager/cert-manager/CERT_MANAGER_CONTROLLER_ATTRIBUTION.txt b/projects/cert-manager/cert-manager/CERT_MANAGER_CONTROLLER_ATTRIBUTION.txt
@@ -32,7 +32,7 @@ https://github.com/Azure/go-autorest/tracing
 ** github.com/cert-manager/cert-manager; version v0.0.0-00010101000000-000000000000 --
 https://github.com/cert-manager/cert-manager
 
-** github.com/cert-manager/cert-manager/controller-binary; version v1.12.2 --
+** github.com/cert-manager/cert-manager/controller-binary; version v1.12.1 --
 https://github.com/cert-manager/cert-manager/controller-binary
 
 ** github.com/coreos/go-semver/semver; version v0.3.0 --

diff --git a/projects/cert-manager/cert-manager/CERT_MANAGER_CTL_ATTRIBUTION.txt b/projects/cert-manager/cert-manager/CERT_MANAGER_CTL_ATTRIBUTION.txt
@@ -2,7 +2,7 @@
 ** github.com/cert-manager/cert-manager; version v1.12.1-0.20230524130037-7ea113504de2 --
 https://github.com/cert-manager/cert-manager
 
-** github.com/cert-manager/cert-manager/cmd/ctl; version v1.12.2 --
+** github.com/cert-manager/cert-manager/cmd/ctl; version v1.12.1 --
 https://github.com/cert-manager/cert-manager/cmd/ctl
 
 ** github.com/containerd/containerd; version v1.7.0 --

diff --git a/projects/cert-manager/cert-manager/CERT_MANAGER_WEBHOOK_ATTRIBUTION.txt b/projects/cert-manager/cert-manager/CERT_MANAGER_WEBHOOK_ATTRIBUTION.txt
@@ -2,7 +2,7 @@
 ** github.com/cert-manager/cert-manager; version v0.0.0-00010101000000-000000000000 --
 https://github.com/cert-manager/cert-manager
 
-** github.com/cert-manager/cert-manager/webhook-binary; version v1.12.2 --
+** github.com/cert-manager/cert-manager/webhook-binary; version v1.12.1 --
 https://github.com/cert-manager/cert-manager/webhook-binary
 
 ** github.com/go-logr/logr; version v1.2.4 --

diff --git a/projects/cert-manager/cert-manager/CHECKSUMS b/projects/cert-manager/cert-manager/CHECKSUMS
@@ -1,10 +1,10 @@
-55bb3ab64e1b7800f5a44edd0b217dfad9f7eddb962bbf6f110c838c858595dd  _output/bin/cert-manager/linux-amd64/cert-manager-acmesolver
-e34ca2b8c8c47f2f05e2ea041695e8c7422b31e5ebfeba6241410453b0ebdc86  _output/bin/cert-manager/linux-amd64/cert-manager-cainjector
-a9e6a4c4a0ba8fc6d1d93f1a96832470023f31038e8b30e4c3628a0eeac9c7bd  _output/bin/cert-manager/linux-amd64/cert-manager-controller
-5ef1243565f0224ad4af2fcfb5c05a442435745db2faecd4bb044a675c72477e  _output/bin/cert-manager/linux-amd64/cert-manager-ctl
-788d265ec23993384d2a8cb77a724ba87fa66b7a39450a3a3d71e42f1f05f9af  _output/bin/cert-manager/linux-amd64/cert-manager-webhook
-b105c8f3e6cd7d844522f97ad27d21778b54b7554d30d849a15ce73cc33bb2de  _output/bin/cert-manager/linux-arm64/cert-manager-acmesolver
-d9e13b63b4a6e08009cd6e5512a3a514d89e5ac873a84acf3e97bba35bd75450  _output/bin/cert-manager/linux-arm64/cert-manager-cainjector
-f20795a19580f2a083f90d3abd9ac83a1b734b91a6b37412471e6962d9f0b915  _output/bin/cert-manager/linux-arm64/cert-manager-controller
-ba802dc58d3764b09384c0df28c6115d7afbd41e0e434b976603cfd8de16f96b  _output/bin/cert-manager/linux-arm64/cert-manager-ctl
-43db2e15a508b0fd47e8956cd437ef96605e01f9341a6702268d309db11fd227  _output/bin/cert-manager/linux-arm64/cert-manager-webhook
+b27e0f8fdde56522342b15531b586f1a1658d79f62c0b4dbb30e8f8cb72b1d7f  _output/bin/cert-manager/linux-amd64/cert-manager-acmesolver
+ec50b30c6650eb43f353b2c2012f83a9f9141dc7ace18c372c5b840ff0df1df9  _output/bin/cert-manager/linux-amd64/cert-manager-cainjector
+868f0e629002bd69d91c388f8fadd8563d28a7af4dd149c2cb76ada5fe4624f3  _output/bin/cert-manager/linux-amd64/cert-manager-controller
+a9e25f38de1f72c6438c488f199f95a59e37b91e987ce659612911ec0cd8d6f5  _output/bin/cert-manager/linux-amd64/cert-manager-ctl
+c61c06716d578cede28ffa1b85f21110dd47564adf95125d27999a100be579b5  _output/bin/cert-manager/linux-amd64/cert-manager-webhook
+ec169a43ebc6830c935dff29536c2d2dc799a4c34e2dfc6a1c5af7a9dc76b82a  _output/bin/cert-manager/linux-arm64/cert-manager-acmesolver
+58bdda035d98549df3829c085cc32ca8a7d141130fd3195e01c1bc8f69e4a47d  _output/bin/cert-manager/linux-arm64/cert-manager-cainjector
+33800139795ef5d4762092c57dcd5e32a0ca8fac4bd4ff1105f621b3ea46cd67  _output/bin/cert-manager/linux-arm64/cert-manager-controller
+9d1c1ae65ade567d3340d5b8b0f8f54ba852978af6b892d11505342d38d1df32  _output/bin/cert-manager/linux-arm64/cert-manager-ctl
+b9387c69c37ba6ab93cab8681b933e61493c60a9ee13842af19627358ee444e2  _output/bin/cert-manager/linux-arm64/cert-manager-webhook
diff --git a/projects/cert-manager/cert-manager/GIT_TAG b/projects/cert-manager/cert-manager/GIT_TAG
@@ -1 +1 @@
-v1.12.2
+v1.12.1
diff --git a/projects/cert-manager/cert-manager/README.md b/projects/cert-manager/cert-manager/README.md
@@ -1,5 +1,5 @@
 ## **cert-manager**
-![Version](https://img.shields.io/badge/version-v1.12.2-blue)
+![Version](https://img.shields.io/badge/version-v1.12.1-blue)
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiUkphQkhWTUpOOVE1OFVLU0dHQmVFUXZJV0dJaGVLYmtEZHp0aGtDRnJBQUxtaHVqOWp3S0l6d0NlTytqNWpwc2tNTmF6RnNhMTZ3d1J1RXErR0lWcldZPSIsIml2UGFyYW1ldGVyU3BlYyI6IlQyU2lIcVVtU3ozZVZSVTgiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
 
 [cert-manager](https://github.com/cert-manager/cert-manager) is a Kubernetes add-on to automate the management and issuance of TLS certificates from various issuing sources, such as [Let’s Encrypt](https://letsencrypt.org), [HashiCorp Vault](https://www.vaultproject.io), [Venafi](https://www.venafi.com/), a simple signing key pair, or self signed. It periodically ensures that certificates are valid and up-to-date, and attempts to renew certificates at an appropriate time before expiry.