Merge pull request #1702 from k8s-infra-cherrypick-robot/cherry-pick-…

…1693-to-release-1.4 [release-1.4] chore: bump trivy to v0.57.1 and use golang:1.22 in dockerfile
kubernetes-sigs · Dec 5, 2024 · 2171c82 · 2171c82
2 parents b2bddd5 + 80a2c34
commit 2171c82
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -103,7 +103,7 @@ KIND_VERSION ?= 0.23.0
 KUBERNETES_VERSION ?= 1.30.2
 KUBECTL_VERSION ?= 1.25.3
 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

diff --git 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
@@ -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
@@ -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