From 8515711e164b9a8b69e2a7fa15849bcb9eb4bf22 Mon Sep 17 00:00:00 2001 From: Jiawei Huang Date: Mon, 21 Oct 2024 16:24:15 -0700 Subject: [PATCH] Bump k8s utilities to v1.30 release train --- Dockerfile | 14 +++++++------- base/Dockerfile | 6 +++--- qemu/Dockerfile | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c657e5f..eafc9a08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ ARG TARGETARCH=${TARGETARCH} -FROM calico/bpftool:v7.4.0 as bpftool +FROM calico/bpftool:v7.4.0 AS bpftool -FROM --platform=amd64 calico/qemu-user-static:latest as qemu +FROM --platform=amd64 calico/qemu-user-static:latest AS qemu -FROM registry.access.redhat.com/ubi8/ubi:latest as ubi +FROM registry.access.redhat.com/ubi8/ubi:latest AS ubi ARG TARGETARCH @@ -16,8 +16,8 @@ ARG GOLANG_SHA256_S390X=de1f94d7dd3548ba3036de1ea97eb8243881c22a88fcc04cc08c704d ARG CONTAINERREGISTRY_VERSION=v0.20.2 ARG GO_LINT_VERSION=v1.61.0 -ARG K8S_VERSION=v1.29.9 -ARG K8S_LIBS_VERSION=v0.29.9 +ARG K8S_VERSION=v1.30.5 +ARG K8S_LIBS_VERSION=v0.30.5 ARG MOCKERY_VERSION=2.45.1 ARG CALICO_CONTROLLER_TOOLS_VERSION=calico-0.1 @@ -170,7 +170,6 @@ RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.20.2 && mv /go/bin/ginkgo /go go install github.com/swaggo/swag/cmd/swag@v1.16.3 && \ go install github.com/wadey/gocovmerge@v0.0.0-20160331181800-b5bfa59ec0ad && \ go install golang.org/x/tools/cmd/goimports@v0.25.0 && \ - go install mvdan.cc/gofumpt@v0.7.0 && \ go install golang.org/x/tools/cmd/stringer@v0.25.0 && \ go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.5.1 && \ go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.2 && \ @@ -181,7 +180,8 @@ RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.20.2 && mv /go/bin/ginkgo /go go install k8s.io/code-generator/cmd/defaulter-gen@${K8S_LIBS_VERSION} && \ go install k8s.io/code-generator/cmd/informer-gen@${K8S_LIBS_VERSION} && \ go install k8s.io/code-generator/cmd/lister-gen@${K8S_LIBS_VERSION} && \ - go install k8s.io/code-generator/cmd/openapi-gen@${K8S_LIBS_VERSION} + go install k8s.io/kube-openapi/cmd/openapi-gen@v0.0.0-20241009091222-67ed5848f094 && \ + go install mvdan.cc/gofumpt@v0.7.0 # Build and install semvalidator COPY semvalidator/go.mod semvalidator/go.sum semvalidator/main.go /tmp/semvalidator/ diff --git a/base/Dockerfile b/base/Dockerfile index b7231fd6..7531a2b6 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,6 +1,6 @@ -FROM --platform=linux/amd64 calico/qemu-user-static:latest as qemu +FROM --platform=linux/amd64 calico/qemu-user-static:latest AS qemu -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as ubi +FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS ubi ARG LDSONAME @@ -38,7 +38,7 @@ RUN cp /etc/nsswitch.conf /rootfs/etc/nsswitch.conf # Copy base image release info. RUN cp /etc/os-release /rootfs/etc/os-release -FROM scratch as source +FROM scratch AS source COPY --from=ubi /rootfs / diff --git a/qemu/Dockerfile b/qemu/Dockerfile index f7b163ef..2f8dca26 100644 --- a/qemu/Dockerfile +++ b/qemu/Dockerfile @@ -1,8 +1,8 @@ -FROM fedora:latest as qemu +FROM fedora:latest AS qemu RUN dnf install -y qemu-user-static -FROM scratch as source +FROM scratch AS source COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static COPY --from=qemu /usr/bin/qemu-ppc64le-static /usr/bin/qemu-ppc64le-static