From c5d2bd300190d1e790b165ae683fe73f632cacb1 Mon Sep 17 00:00:00 2001 From: Anish Ramasekar Date: Tue, 19 Nov 2024 21:18:54 +0530 Subject: [PATCH 1/2] chore: bump trivy to v0.57.1 to mitigate rate limit issues Signed-off-by: Anish Ramasekar --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6a76f2d23..dda3e6776 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ KIND_VERSION ?= 0.23.0 KUBERNETES_VERSION ?= 1.30.2 KUBECTL_VERSION ?= 1.30.2 BATS_VERSION ?= 1.4.1 -TRIVY_VERSION ?= 0.39.1 +TRIVY_VERSION ?= 0.57.1 PROTOC_VERSION ?= 3.20.1 SHELLCHECK_VER ?= v0.8.0 YQ_VERSION ?= v4.11.2 From 041d14233cbc642caee545b148f68683cc0a9b57 Mon Sep 17 00:00:00 2001 From: Anish Ramasekar Date: Thu, 5 Dec 2024 02:35:14 +0530 Subject: [PATCH 2/2] chore: bump to golang 1.22 builder image in dockerfile Signed-off-by: Anish Ramasekar --- docker/Dockerfile | 2 +- docker/crd.Dockerfile | 2 +- docker/windows.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 06031e19f..0442099ad 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ ARG BASEIMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4 -FROM golang:1.21@sha256:7026fb72cfa9cc112e4d1bf4b35a15cac61a413d0252d06615808e7c987b33a7 as builder +FROM golang:1.22 as builder WORKDIR /go/src/sigs.k8s.io/secrets-store-csi-driver ADD . . ARG TARGETARCH diff --git a/docker/crd.Dockerfile b/docker/crd.Dockerfile index 9261f372e..b06872a05 100644 --- a/docker/crd.Dockerfile +++ b/docker/crd.Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. FROM alpine as builder -ARG KUBE_VERSION=v1.29.4 +ARG KUBE_VERSION=v1.29.11 ARG TARGETARCH RUN apk add --no-cache curl && \ diff --git a/docker/windows.Dockerfile b/docker/windows.Dockerfile index 84eeed33c..929c83a31 100644 --- a/docker/windows.Dockerfile +++ b/docker/windows.Dockerfile @@ -17,7 +17,7 @@ ARG BASEIMAGE_CORE=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1 FROM --platform=linux/amd64 ${BASEIMAGE_CORE} as core -FROM --platform=$BUILDPLATFORM golang:1.21@sha256:7026fb72cfa9cc112e4d1bf4b35a15cac61a413d0252d06615808e7c987b33a7 as builder +FROM --platform=$BUILDPLATFORM golang:1.22 as builder WORKDIR /go/src/sigs.k8s.io/secrets-store-csi-driver ADD . . ARG TARGETARCH