From 84ad66d679ab5f21792462e99ae72a4e31392415 Mon Sep 17 00:00:00 2001 From: Alex Kalenyuk Date: Mon, 6 May 2024 17:35:43 +0300 Subject: [PATCH 1/2] Update builder to use golang 1.22.3 Signed-off-by: Alex Kalenyuk --- hack/build/docker/builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/build/docker/builder/Dockerfile b/hack/build/docker/builder/Dockerfile index 150c0ef4c5..30f2edf201 100644 --- a/hack/build/docker/builder/Dockerfile +++ b/hack/build/docker/builder/Dockerfile @@ -33,7 +33,7 @@ RUN pip3 install --upgrade j2cli operator-courier==2.1.11 && \ ln -s /opt/gradle/gradle-6.6/bin/gradle /usr/local/bin/gradle && \ rm gradle-6.6-bin.zip -ENV GIMME_GO_VERSION=1.21.5 GOPATH="/go" GO111MODULE="on" +ENV GIMME_GO_VERSION=1.22.3 GOPATH="/go" GO111MODULE="on" RUN mkdir -p /gimme && curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | HOME=/gimme bash >> /etc/profile.d/gimme.sh From 07071f296a9055919f081c9eae8137087ae9d06b Mon Sep 17 00:00:00 2001 From: Alex Kalenyuk Date: Mon, 6 May 2024 23:46:26 +0300 Subject: [PATCH 2/2] Update controller-gen to v0.14.0 Avoid make generate panic: https://github.com/kubernetes-sigs/controller-tools/issues/888 Signed-off-by: Alex Kalenyuk --- hack/build/docker/builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/build/docker/builder/Dockerfile b/hack/build/docker/builder/Dockerfile index 30f2edf201..e74ab16cd4 100644 --- a/hack/build/docker/builder/Dockerfile +++ b/hack/build/docker/builder/Dockerfile @@ -46,7 +46,7 @@ RUN \ go install github.com/mattn/goveralls@latest && \ go install golang.org/x/lint/golint@latest && \ go install github.com/rmohr/go-swagger-utils/swagger-doc@latest && \ - go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0 && \ + go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 && \ go install github.com/securego/gosec/v2/cmd/gosec@latest && \ rm -rf "${GOPATH}/pkg"