Merge pull request #597 from hjiawei/bump-k8s-1.30

Bump k8s utilities to v1.30 release train

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/[email protected] && mv /go/bin/ginkgo /go
     go install github.com/swaggo/swag/cmd/[email protected] && \
     go install github.com/wadey/[email protected] && \
     go install golang.org/x/tools/cmd/[email protected] && \
-    go install  mvdan.cc/[email protected] && \
     go install golang.org/x/tools/cmd/[email protected] && \
     go install google.golang.org/grpc/cmd/[email protected] && \
     go install google.golang.org/protobuf/cmd/[email protected] && \
@@ -181,7 +180,8 @@ RUN go install github.com/onsi/ginkgo/v2/[email protected] && 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/[email protected] && \
+    go install mvdan.cc/[email protected]
 
 # Build and install semvalidator
 COPY semvalidator/go.mod semvalidator/go.sum semvalidator/main.go /tmp/semvalidator/

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 /
 

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