From 03f9832ca9e845833672758896483a869cd27168 Mon Sep 17 00:00:00 2001
From: Ashley Davis <ashley.davis@venafi.com>
Date: Wed, 20 Nov 2024 11:15:57 +0000
Subject: [PATCH] [release-1.16] bump go + base images

Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
---
 make/_shared/klone/01_mod.mk |  5 ++++-
 make/_shared/tools/00_mod.mk | 10 +++++-----
 make/base_images.mk          | 20 ++++++++++----------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/make/_shared/klone/01_mod.mk b/make/_shared/klone/01_mod.mk
index a3d07dd2778..91511684171 100644
--- a/make/_shared/klone/01_mod.mk
+++ b/make/_shared/klone/01_mod.mk
@@ -18,7 +18,10 @@
 generate-klone: | $(NEEDS_KLONE)
 	$(KLONE) sync
 
-shared_generate_targets += generate-klone
+# MANUAL CHANGE!
+# generate-klone is removed so we can manually update versions
+# and diverge from upstream klone
+# shared_generate_targets += generate-klone
 
 .PHONY: upgrade-klone
 ## Upgrade klone Makefile modules to latest version
diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk
index 04918d5be65..43cbc6b71aa 100644
--- a/make/_shared/tools/00_mod.mk
+++ b/make/_shared/tools/00_mod.mk
@@ -159,7 +159,7 @@ ADDITIONAL_TOOLS ?=
 tools += $(ADDITIONAL_TOOLS)
 
 # https://go.dev/dl/
-VENDORED_GO_VERSION := 1.23.2
+VENDORED_GO_VERSION := 1.23.3
 
 # Print the go version which can be used in GH actions
 .PHONY: print-go-version
@@ -378,10 +378,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
 # File downloads #
 ##################
 
-go_linux_amd64_SHA256SUM=542d3c1705f1c6a1c5a80d5dc62e2e45171af291e755d591c5e6531ef63b454e
-go_linux_arm64_SHA256SUM=f626cdd92fc21a88b31c1251f419c17782933a42903db87a174ce74eeecc66a9
-go_darwin_amd64_SHA256SUM=445c0ef19d8692283f4c3a92052cc0568f5a048f4e546105f58e991d4aea54f5
-go_darwin_arm64_SHA256SUM=d87031194fe3e01abdcaf3c7302148ade97a7add6eac3fec26765bcb3207b80f
+go_linux_amd64_SHA256SUM=a0afb9744c00648bafb1b90b4aba5bdb86f424f02f9275399ce0c20b93a2c3a8
+go_linux_arm64_SHA256SUM=1f7cbd7f668ea32a107ecd41b6488aaee1f5d77a66efd885b175494439d4e1ce
+go_darwin_amd64_SHA256SUM=c7e024d5c0bc81845070f23598caf02f05b8ae88fd4ad2cd3e236ddbea833ad2
+go_darwin_arm64_SHA256SUM=31e119fe9bde6e105407a32558d5b5fa6ca11e2bd17f8b7b2f8a06aba16a0632
 
 .PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
 $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools
diff --git a/make/base_images.mk b/make/base_images.mk
index 4caf992f5d6..e60e5777195 100644
--- a/make/base_images.mk
+++ b/make/base_images.mk
@@ -1,12 +1,12 @@
 # +skip_license_check
 # autogenerated by hack/latest-base-images.sh
-STATIC_BASE_IMAGE_amd64 := gcr.io/distroless/static-debian12@sha256:ce67e31631ef5b880a1782595341cf8fbb7478d1cc519ce84d2b9813099d5215
-STATIC_BASE_IMAGE_arm64 := gcr.io/distroless/static-debian12@sha256:028a86d5184d87b713921958bb3f93474273166092dad8ecdc58a5caa5c408ee
-STATIC_BASE_IMAGE_s390x := gcr.io/distroless/static-debian12@sha256:232c4af4ec1c6eb9004d7860c613afbd959c38c4a19f4746c06a300f4ae3ed04
-STATIC_BASE_IMAGE_arm   := gcr.io/distroless/static-debian12@sha256:60388e9465f6774d6edf055390b824c4e65141617a57cc8ca619baf03276afba
-STATIC_BASE_IMAGE_ppc64le := gcr.io/distroless/static-debian12@sha256:8da9ce5e3df9c78a33ee7def189a4711bd6a66fe157f5a701e647d0beaa5faa2
-DYNAMIC_BASE_IMAGE_amd64 := gcr.io/distroless/base-debian12@sha256:71667b504b57a3aa13b1a61d9ba4147aeed27bb024b9ae1833970fae9f5ed34e
-DYNAMIC_BASE_IMAGE_arm64 := gcr.io/distroless/base-debian12@sha256:0034f6306134559ebe7a17d1c80cdb783853e74779e1bb052ad386d3bb78e58b
-DYNAMIC_BASE_IMAGE_s390x := gcr.io/distroless/base-debian12@sha256:ee3abf1da865c3fd42698cc90577a58d1d7a75a97470e5d4cda778e31d6c4b37
-DYNAMIC_BASE_IMAGE_arm   := gcr.io/distroless/base-debian12@sha256:e62db4b1bec5db65264cec836bd14f8a9b6e78dada69fbf5d0ad243110b71186
-DYNAMIC_BASE_IMAGE_ppc64le := gcr.io/distroless/base-debian12@sha256:f187727188786eb9b46a84043275be45ca9a740a4a1af0695547f0001d763dda
+STATIC_BASE_IMAGE_amd64 := gcr.io/distroless/static-debian12@sha256:da2ac7d8a75b088d4fcaf29e0ea7387ef23b68bc849b78441e50181ef9962264
+STATIC_BASE_IMAGE_arm64 := gcr.io/distroless/static-debian12@sha256:e2d1ce5d5a89eadf85c5562e07f74e29a8831a71947d7a37637d74c7965f3f4a
+STATIC_BASE_IMAGE_s390x := gcr.io/distroless/static-debian12@sha256:89e4535bb0e17ee1adc0e65f6604fce71c5014e19d3c34970c03fe1733ba9fd6
+STATIC_BASE_IMAGE_arm   := gcr.io/distroless/static-debian12@sha256:e88eae98182a69dbe853a0674408ebe08f1b58c2655161862e68fa5dc4deab84
+STATIC_BASE_IMAGE_ppc64le := gcr.io/distroless/static-debian12@sha256:600b699062d6e0d140756436e9f9a7ac13cdc1c18aac4af932f84874c350da7e
+DYNAMIC_BASE_IMAGE_amd64 := gcr.io/distroless/base-debian12@sha256:7a84afc88a0f078dbf559ea2e511047706acaeadfb6ecdfb14657c17b006c817
+DYNAMIC_BASE_IMAGE_arm64 := gcr.io/distroless/base-debian12@sha256:7034c17c8c2268f4cabbaf8eced1ff311f666e0b38228a8205a30faf0b1aa37f
+DYNAMIC_BASE_IMAGE_s390x := gcr.io/distroless/base-debian12@sha256:3a9c7dbd4e14447cc3de95803c353b6d0f482b1243990ebec77882d404df4220
+DYNAMIC_BASE_IMAGE_arm   := gcr.io/distroless/base-debian12@sha256:02b1a9880b3a52d877e7b10c7d255b1945585995d5f96f8c23125d47444af8a8
+DYNAMIC_BASE_IMAGE_ppc64le := gcr.io/distroless/base-debian12@sha256:36c41d34d5ed271ea8489c71dd799ea06e6ed043ebe63d81167ca6aecb1ba880