aws · jonathanmeier5 · May 29, 2023 · May 30, 2023 · May 30, 2023 · Jun 6, 2023
diff --git a/EKSD_LATEST_RELEASES b/EKSD_LATEST_RELEASES
@@ -12,21 +12,21 @@ releases:
   number: 26
   kubeVersion: v1.21.14
 - branch: 1-22
-  number: 27
+  number: 28
   kubeVersion: v1.22.17
 - branch: 1-23
-  number: 22
+  number: 25
   kubeVersion: v1.23.17
 - branch: 1-24
-  number: 17
-  kubeVersion: v1.24.13
+  number: 20
+  kubeVersion: v1.24.15
 - branch: 1-25
-  number: 13
-  kubeVersion: v1.25.9
+  number: 16
+  kubeVersion: v1.25.11
 - branch: 1-26
-  number: 9
-  kubeVersion: v1.26.4
+  number: 12
+  kubeVersion: v1.26.6
 - branch: 1-27
-  number: 3
-  kubeVersion: v1.27.1
+  number: 6
+  kubeVersion: v1.27.3
 latest: 1-25
diff --git a/EKS_DISTRO_BASE_TAG_FILE b/EKS_DISTRO_BASE_TAG_FILE
@@ -1 +1 @@
-2023-05-16-1684263667.2
+2023-06-27-1687892493.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_CSI_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_CSI_TAG_FILE
@@ -1 +1 @@
-2023-05-16-1684263667.2
+2023-06-27-1687892493.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_DOCKER_CLIENT_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_DOCKER_CLIENT_TAG_FILE
@@ -1 +1 @@
-2023-05-01-1682967648.2
+2023-06-08-1686250870.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_GIT_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_GIT_TAG_FILE
@@ -1 +1 @@
-2023-05-02-1683054064.2
+2023-06-27-1687892493.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_GLIBC_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_GLIBC_TAG_FILE
@@ -1 +1 @@
-2023-02-22-1677092456.2
+2023-06-08-1686250870.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_GOLANG_COMPILER_1.17_GCC_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_GOLANG_COMPILER_1.17_GCC_TAG_FILE
@@ -1 +1 @@
-1.17-gcc-2023-05-16-1684263667.2
+1.17-gcc-2023-06-08-1686250870.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_HAPROXY_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_HAPROXY_TAG_FILE
@@ -1 +1 @@
-2023-02-22-1677092456.2
+2023-06-08-1686250870.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_IPTABLES_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_IPTABLES_TAG_FILE
@@ -1 +1 @@
-2023-03-06-1678131614.2
+2023-06-08-1686250870.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_KIND_AL2023_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_KIND_AL2023_TAG_FILE
@@ -1 +1 @@
-2023-05-03-1683140473.2023
+2023-06-27-1687892492.2023
diff --git a/EKS_DISTRO_MINIMAL_BASE_KIND_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_KIND_TAG_FILE
@@ -1 +1 @@
-2023-05-16-1684263667.2
+2023-06-27-1687892493.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_NGINX_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_NGINX_TAG_FILE
@@ -1 +1 @@
-2023-05-16-1684263667.2
+2023-06-27-1687892493.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_NONROOT_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_NONROOT_TAG_FILE
@@ -1 +1 @@
-2023-02-22-1677092456.2
+2023-06-06-1686078098.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_PYTHON_3.9_AL2023_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_PYTHON_3.9_AL2023_TAG_FILE
@@ -0,0 +1 @@
+3.9-2023-06-27-1687892492.2023
diff --git a/EKS_DISTRO_MINIMAL_BASE_PYTHON_3.9_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_PYTHON_3.9_TAG_FILE
@@ -1 +1 @@
-3.9-2023-03-23-1679598055.2023
+3.9-2023-06-27-1687892493.2
diff --git a/EKS_DISTRO_MINIMAL_BASE_TAG_FILE b/EKS_DISTRO_MINIMAL_BASE_TAG_FILE
@@ -1 +1 @@
-2023-02-22-1677092456.2
+2023-06-06-1686078098.2
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -124,7 +124,7 @@ projects:
           - commit: 299c9637229fb2bf849c1d86243fe2948d14101e
       - name: cloud-provider-aws
         versions:
-          - tag: v1.27.0
+          - tag: v1.27.1
       - name: cloud-provider-vsphere
         versions:
           - tag: v1.20.1

diff --git a/build/lib/common.sh b/build/lib/common.sh
@@ -115,19 +115,7 @@ function build::gather_licenses() {
   export GOOS=linux 
   export GOARCH=amd64 
 
-  # the version of go used here must be the version go-licenses was installed with
-  # by default we use 1.16, but due to changes in 1.17, there are some changes that require using 1.17
-  if [ "$golang_version" == "1.20" ]; then
-    build::common::use_go_version 1.20
-  elif [ "$golang_version" == "1.19" ]; then
-    build::common::use_go_version 1.19
-  elif [ "$golang_version" == "1.18" ]; then
-    build::common::use_go_version 1.18
-  elif [ "$golang_version" == "1.17" ]; then
-    build::common::use_go_version 1.17
-  else
-    build::common::use_go_version 1.16
-  fi
+  build::common::use_go_version "$golang_version"
 
   if ! command -v go-licenses &> /dev/null
   then
@@ -255,6 +243,11 @@ function build::common::get_go_path() {
 function build::common::use_go_version() {
   local -r version=$1
 
+  if (( "${version#*.}" < 16 )); then
+    echo "Building with GO version $version is no longer supported!  Please update the build to use a newer version."
+    exit 1
+  fi
+
   local -r gobinarypath=$(build::common::get_go_path $version)
   echo "Adding $gobinarypath to PATH"
   # Adding to the beginning of PATH to allow for builds on specific version if it exists

diff --git a/build/lib/eksa_releases.sh b/build/lib/eksa_releases.sh
diff --git a/build/lib/eksd_releases.sh b/build/lib/eksd_releases.sh
diff --git a/build/lib/install_go_versions.sh b/build/lib/install_go_versions.sh
@@ -34,18 +34,12 @@ setupgo() {
     ln -sf ${HOME}/sdk/go${version}/bin/gofmt ${GOPATH}/go${majorversion}/bin/gofmt
 }
 
-setupgo "${GOLANG113_VERSION:-1.13.15}"
-setupgo "${GOLANG114_VERSION:-1.14.15}"
-setupgo "${GOLANG115_VERSION:-1.15.15}"
 setupgo "${GOLANG116_VERSION:-1.16.15}"
 setupgo "${GOLANG117_VERSION:-1.17.13}"
 setupgo "${GOLANG118_VERSION:-1.18.10}"
-setupgo "${GOLANG119_VERSION:-1.19.9}"
-setupgo "${GOLANG120_VERSION:-1.20.4}"
+setupgo "${GOLANG119_VERSION:-1.19.10}"
+setupgo "${GOLANG120_VERSION:-1.20.5}"
 
-# use 1.16 or 1.17 when installing and running go-licenses
-# go-licenses needs to be installed by the same version of go that is being used
-# to generate the deps list during the attribution generation process
 build::common::use_go_version "1.16"
 GOBIN=${GOPATH}/go1.16/bin go install github.com/jaxesn/go-licenses@4497a2a38565e4e6ad095ea8117c25ecd622d0cc
 
@@ -61,5 +55,5 @@ GOBIN=${GOPATH}/go1.19/bin go install github.com/jaxesn/go-licenses@6800d77c11d0
 build::common::use_go_version "1.20"
 GOBIN=${GOPATH}/go1.20/bin go install github.com/jaxesn/go-licenses@6800d77c11d0ef8628e7eda908b1d1149383ca48
 
-# 1.16 is the default so symlink it to /go/bin
-ln -sf ${GOPATH}/go1.16/bin/go-licenses ${GOPATH}/bin
+# 1.18 is the default so symlink it to /go/bin
+ln -sf ${GOPATH}/go1.18/bin/go-licenses ${GOPATH}/bin
diff --git a/projects/aquasecurity/harbor-scanner-trivy/ATTRIBUTION.txt b/projects/aquasecurity/harbor-scanner-trivy/ATTRIBUTION.txt
@@ -427,7 +427,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ------
 
-** golang.org/go; version go1.19.9 --
+** golang.org/go; version go1.19.10 --
 https://github.com/golang/go
 
 ** golang.org/x/net/context; version v0.7.0 --

diff --git a/projects/aquasecurity/harbor-scanner-trivy/CHECKSUMS b/projects/aquasecurity/harbor-scanner-trivy/CHECKSUMS
@@ -1,2 +1,2 @@
-4ad18a1cd2fdaea7b1e3aeff63c6120b179b657683a39dc6b6bca41afb841bf2  _output/bin/harbor-scanner-trivy/linux-amd64/scanner-trivy
-afaf2ccd6e3a06e65a216e8acfc285bb476225c506c996f0d4de59a5ab68249a  _output/bin/harbor-scanner-trivy/linux-arm64/scanner-trivy
+8b552699cc515c123eca8e78fa2d1c6ec1a4fde9ab0e3c740c7dda240d74fc5d  _output/bin/harbor-scanner-trivy/linux-amd64/scanner-trivy
+14b888a5af30717574c68e4da8a3f04515b4a249fb9062b9d5bfbd43ce3bb098  _output/bin/harbor-scanner-trivy/linux-arm64/scanner-trivy
diff --git a/projects/aquasecurity/trivy/ATTRIBUTION.txt b/projects/aquasecurity/trivy/ATTRIBUTION.txt
@@ -1389,7 +1389,7 @@ https://github.com/liggitt/tabwriter
 ** github.com/ProtonMail/go-crypto; version v0.0.0-20210428141323-04723f9f07d7 --
 https://github.com/ProtonMail/go-crypto
 
-** golang.org/go; version go1.19.9 --
+** golang.org/go; version go1.19.10 --
 https://github.com/golang/go
 
 ** golang.org/x/crypto; version v0.5.0 --

diff --git a/projects/aquasecurity/trivy/CHECKSUMS b/projects/aquasecurity/trivy/CHECKSUMS
@@ -1,2 +1,2 @@
-9430ab8667c47a8628e8181b1261408391017f3dea7daa7cdde46e55219ab3d3  _output/bin/trivy/linux-amd64/trivy
-e7a6d1430238bce1b0db3a50fb58be297942108181b4718d017611edddca0604  _output/bin/trivy/linux-arm64/trivy
+70204a2bcb6e8eeb95572130a47cb535336595bdeff6cad0ea5948e1d68df892  _output/bin/trivy/linux-amd64/trivy
+c0b485016250d2a38b931aacc97e6fba4e7e1c4e7e3f4c025fd514461be287ff  _output/bin/trivy/linux-arm64/trivy
diff --git a/projects/aws/bottlerocket-bootstrap/ATTRIBUTION.txt b/projects/aws/bottlerocket-bootstrap/ATTRIBUTION.txt
@@ -382,7 +382,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ** github.com/aws/aws-sdk-go-v2/internal/sync/singleflight; version v1.14.0 --
 https://github.com/aws/aws-sdk-go-v2
 
-** golang.org/go; version go1.20.4 --
+** golang.org/go; version go1.20.5 --
 https://github.com/golang/go
 
 ** golang.org/x/net; version v0.7.0 --

diff --git a/projects/aws/bottlerocket-bootstrap/CHECKSUMS b/projects/aws/bottlerocket-bootstrap/CHECKSUMS
@@ -1,4 +1,4 @@
-79f049e8c8b8c2d6550bb312047414a27a68e8e68e92b98ed7e38cc95b15a5e4  _output/bin/bottlerocket-bootstrap/linux-amd64/bottlerocket-bootstrap
-114164839cd4696392db6707a3369324c390f6c7a93a0a852fbc6f964b82b3e8  _output/bin/bottlerocket-bootstrap/linux-amd64/bottlerocket-bootstrap-snow
-3a5a6667b729620cb3098863cfa3935e1c06a32142f063708f204ca8a45d369d  _output/bin/bottlerocket-bootstrap/linux-arm64/bottlerocket-bootstrap
-2bd9d9859e38c69ca146544874ceb05fbb07c249361314d0de27f6fa7aa0c6f7  _output/bin/bottlerocket-bootstrap/linux-arm64/bottlerocket-bootstrap-snow
+fa33dff0e81c3d30238fe4a284acf5a8826c98d10e8b415ab652284dd94a8968  _output/bin/bottlerocket-bootstrap/linux-amd64/bottlerocket-bootstrap
+66e8c7f817dfd906055cf0a6be0cace0cbcfc7cbbd5a8cda10a86efec8a33274  _output/bin/bottlerocket-bootstrap/linux-amd64/bottlerocket-bootstrap-snow
+beee4a606dfbeb805ec78e505aac68996ccbb71b5cab107b9589f7e452a7af01  _output/bin/bottlerocket-bootstrap/linux-arm64/bottlerocket-bootstrap
+18f69057938917586505f7a50ab41dfe8fa8ecb0f9ff5d625929b3bcf4fb3240  _output/bin/bottlerocket-bootstrap/linux-arm64/bottlerocket-bootstrap-snow
diff --git a/projects/aws/eks-anywhere-packages/ATTRIBUTION.txt b/projects/aws/eks-anywhere-packages/ATTRIBUTION.txt
@@ -1028,7 +1028,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ** github.com/liggitt/tabwriter; version v0.0.0-20181228230101-89fcab3d43de --
 https://github.com/liggitt/tabwriter
 
-** golang.org/go; version go1.19.9 --
+** golang.org/go; version go1.19.10 --
 https://github.com/golang/go
 
 ** golang.org/x/crypto; version v0.3.0 --

diff --git a/projects/aws/eks-anywhere-packages/CHECKSUMS b/projects/aws/eks-anywhere-packages/CHECKSUMS
@@ -1,6 +1,6 @@
-a1a07fa6004221e3812125e83250bb883883a43c00da2f40aac97ac5bbe98936  _output/bin/eks-anywhere-packages/linux-amd64/credentialprovider
-555de535eb2054f47d628e4484b24605d0d5de9e2cac8e0b857d40763da9ff81  _output/bin/eks-anywhere-packages/linux-amd64/ecrtokenrefresher
-081ca56262458106b8d740e03f97f14a8da2df1d3ce52f6c837423a1941b4f34  _output/bin/eks-anywhere-packages/linux-amd64/package-manager
-cd839a2d73ba995d246873f69477489d63fdbc093e84e2582261d6ce7acafcff  _output/bin/eks-anywhere-packages/linux-arm64/credentialprovider
-091a2b88d821cd88fe3fcd8f20460bcb2c0f129f48de420f7c34c4ecabf101b6  _output/bin/eks-anywhere-packages/linux-arm64/ecrtokenrefresher
-9eb3ff544091e80ba56c87eecf4a141749fbeb3d8f421949a9607843d3ce8e4a  _output/bin/eks-anywhere-packages/linux-arm64/package-manager
+b1060416b1c966c5e5398d2b37a549a135b7be0f1e84b4923097e8303f40fd67  _output/bin/eks-anywhere-packages/linux-amd64/credentialprovider
+ce1efe3f8589f9c937d66110504a16c22b83d5b21b89bbe4059878fd7bbe7857  _output/bin/eks-anywhere-packages/linux-amd64/ecrtokenrefresher
+3fd583cef4ff002770b013aa2a7c5d0f372a3252e9e334c02d8875e9aff64338  _output/bin/eks-anywhere-packages/linux-amd64/package-manager
+88e339237e9ed3671503253f9be42b604c4c43bb9bfe45667dd9bcb9e7bded18  _output/bin/eks-anywhere-packages/linux-arm64/credentialprovider
+06be211e53ea51f1d4e02ea8b84ea3ac671b5281997160c441b14af0d313289d  _output/bin/eks-anywhere-packages/linux-arm64/ecrtokenrefresher
+2f1bb732ae09387302b9d279c7d9568ae533e8ec4bf600d40ee0727c67d8d453  _output/bin/eks-anywhere-packages/linux-arm64/package-manager
diff --git a/projects/aws/eks-anywhere-packages/CREDENTIALPROVIDER_ATTRIBUTION.txt b/projects/aws/eks-anywhere-packages/CREDENTIALPROVIDER_ATTRIBUTION.txt
@@ -319,7 +319,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** golang.org/go; version go1.19.9 --
+** golang.org/go; version go1.19.10 --
 https://github.com/golang/go
 
 ** golang.org/x/mod/semver; version v0.3.0 --

diff --git a/projects/aws/eks-anywhere-packages/ECRTOKENREFRESHER_ATTRIBUTION.txt b/projects/aws/eks-anywhere-packages/ECRTOKENREFRESHER_ATTRIBUTION.txt
@@ -286,7 +286,7 @@ limitations under the License.
 ** github.com/aws/aws-sdk-go/internal/sync/singleflight; version v1.44.61 --
 https://github.com/aws/aws-sdk-go
 
-** golang.org/go; version go1.19.9 --
+** golang.org/go; version go1.19.10 --
 https://github.com/golang/go
 
 ** golang.org/x/net; version v0.7.0 --

diff --git a/projects/aws/etcdadm-bootstrap-provider/ATTRIBUTION.txt b/projects/aws/etcdadm-bootstrap-provider/ATTRIBUTION.txt
@@ -745,7 +745,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** golang.org/go; version go1.19.9 --
+** golang.org/go; version go1.19.10 --
 https://github.com/golang/go
 
 ** golang.org/x/net; version v0.8.0 --

diff --git a/projects/aws/etcdadm-bootstrap-provider/CHECKSUMS b/projects/aws/etcdadm-bootstrap-provider/CHECKSUMS
@@ -1,2 +1,2 @@
-3e84749383db92d06ee586a9f4670472bc665587cab09754f0b31c02e45183c7  _output/bin/etcdadm-bootstrap-provider/linux-amd64/manager
-d704c4aa2c4a0d16e4ec19092c4a5318cd9d46176ade14d0ce830e9d7d5bf37d  _output/bin/etcdadm-bootstrap-provider/linux-arm64/manager
+f488286e3f2f0c0304f0bbb1766333e34c46eeb3e4814b00d1d180a405fae924  _output/bin/etcdadm-bootstrap-provider/linux-amd64/manager
+408205ed7f37afc8687685390a2dd9da41764751831f94d702efa72d91c9be64  _output/bin/etcdadm-bootstrap-provider/linux-arm64/manager
diff --git a/projects/aws/etcdadm-controller/ATTRIBUTION.txt b/projects/aws/etcdadm-controller/ATTRIBUTION.txt
@@ -803,7 +803,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** golang.org/go; version go1.19.9 --
+** golang.org/go; version go1.19.10 --
 https://github.com/golang/go
 
 ** golang.org/x/net; version v0.8.0 --

diff --git a/projects/aws/etcdadm-controller/CHECKSUMS b/projects/aws/etcdadm-controller/CHECKSUMS
@@ -1,2 +1,2 @@
-b7c0ef21ae309d59ccb17c4f13cb98668693f296fb3b899eda1e4b367c63ace5  _output/bin/etcdadm-controller/linux-amd64/manager
-3e96a7ee2f891359c3bb18ed1468d64e799ba3dc90622047c3efe24fb7f94d18  _output/bin/etcdadm-controller/linux-arm64/manager
+1596b2b2d3f44ca7188317309f1809311d3ee884f3a322ad650f3eb653564f82  _output/bin/etcdadm-controller/linux-amd64/manager
+a9820516d644956c37a1912e6b11c6388ca2940e40fb9c7a01c140bd6fe3823f  _output/bin/etcdadm-controller/linux-arm64/manager