diff --git a/Dockerfile b/Dockerfile index 4c9b4df131..1ea450d2d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Support FROM override -ARG BUILD_IMAGE=docker.io/golang:1.21.9@sha256:7d0dcbe5807b1ad7272a598fbf9d7af15b5e2bed4fd6c4c2b5b3684df0b317dd +ARG BUILD_IMAGE=docker.io/golang:1.21.10@sha256:16438a8e66c0c984f732e815ee5b7d715b8e33e81bac6d6a3750b1067744e7ca ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:9ecc53c269509f63c69a266168e4a687c7eb8c0cfd753bd8bfcaa4f58a90876f # Build the manager binary diff --git a/Makefile b/Makefile index 00732072c3..0baf2fb78c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RUN_NAMESPACE = metal3 GO_TEST_FLAGS = $(TEST_FLAGS) DEBUG = --debug COVER_PROFILE = cover.out -GO_VERSION ?= 1.21.9 +GO_VERSION ?= 1.21.10 ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/hack/e2e/ensure_go.sh b/hack/e2e/ensure_go.sh index 3232a3c558..fb3220d120 100755 --- a/hack/e2e/ensure_go.sh +++ b/hack/e2e/ensure_go.sh @@ -2,7 +2,7 @@ set -eux -MINIMUM_GO_VERSION=go1.21.9 +MINIMUM_GO_VERSION=go1.21.10 # Ensure the go tool exists and is a viable version, or installs it verify_go_version() diff --git a/test/go.mod b/test/go.mod index 24e5200c2a..a340c55d37 100644 --- a/test/go.mod +++ b/test/go.mod @@ -15,8 +15,8 @@ require ( k8s.io/apimachinery v0.29.3 k8s.io/klog/v2 v2.110.1 k8s.io/utils v0.0.0-20230726121419-3b25d923346b - sigs.k8s.io/cluster-api v1.6.4 - sigs.k8s.io/cluster-api/test v1.6.4 + sigs.k8s.io/cluster-api v1.6.5 + sigs.k8s.io/cluster-api/test v1.6.5 sigs.k8s.io/controller-runtime v0.16.5 sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 diff --git a/test/go.sum b/test/go.sum index 6ba2ac10ef..1680d0e1e1 100644 --- a/test/go.sum +++ b/test/go.sum @@ -820,10 +820,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y= -sigs.k8s.io/cluster-api v1.6.4 h1:O3J+Dm/wBMAQSyTtdkEPcWbv4KyY4yqv8Q8g6pJVefM= -sigs.k8s.io/cluster-api v1.6.4/go.mod h1:az1S/g/6umDjmh3ZWpjJWm23peUZOqEt3vv2FuOIZ3s= -sigs.k8s.io/cluster-api/test v1.6.4 h1:eNs1FtKEQqWKxBB19/cQ/1IAgb4nHT0qbh0w7T9yqZ4= -sigs.k8s.io/cluster-api/test v1.6.4/go.mod h1:QimdqQoykUpYpUKkpIabhj8R34wAzw7akMwlCc65xeA= +sigs.k8s.io/cluster-api v1.6.5 h1:9M5uDy+kih9xltpayWbVGEiATMJIdOqe1ejzt6IQ6IA= +sigs.k8s.io/cluster-api v1.6.5/go.mod h1:az1S/g/6umDjmh3ZWpjJWm23peUZOqEt3vv2FuOIZ3s= +sigs.k8s.io/cluster-api/test v1.6.5 h1:kId67PyHbg/ffqTfFI0aVxaJ1DBON+l32d1GpmMNW/o= +sigs.k8s.io/cluster-api/test v1.6.5/go.mod h1:QimdqQoykUpYpUKkpIabhj8R34wAzw7akMwlCc65xeA= sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cULvFZw= sigs.k8s.io/controller-runtime v0.16.5/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= sigs.k8s.io/gateway-api v0.5.0 h1:ze+k9fJqvmL8s1t3e4q1ST8RnN+f09dEv+gfacahlAE=