Generate dockerfiles with "make generate-release"

Author: serverless-qe

openshift/ci-operator/build-image/Dockerfile

@@ -1,17 +1,17 @@
 # DO NOT EDIT! Generated Dockerfile.
 
-FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools
+FROM registry.ci.openshift.org/ocp/4.19:cli-artifacts as tools
 
 # Dockerfile to bootstrap build and test in openshift-ci
-FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20 as builder
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 as builder
 
 ARG TARGETARCH
 
-COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
+COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel9 /usr/bin/oc
 
 RUN ln -s /usr/bin/oc /usr/bin/kubectl
 
-RUN yum install -y httpd-tools
+RUN dnf install -y httpd-tools
 
 RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
     chmod 700 ./get-helm-3

openshift/ci-operator/build-image/kubernetes.repo

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/kn.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -9,30 +9,31 @@ COPY . .
 
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT=strictfipsruntime
-ENV GOFLAGS=''
+ENV GOFLAGS='-mod=mod'
 
-ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:0ae40d26e834e208d0909b90fb3a37c3feb38a299034b5086f1bec69d6719eb2
-ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:58e3ccea5c558575fe4adc6f5f6d570ebec0934de1ba1110bc32fe76fb379c7e
+ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:607e50dd3a9b61d57d125c47a7977c40c4f781bfab01a852a08b40fe42f2b893
+ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:2d8cfab33f1c46b2d4510ea4b56a09e12b8bcf07c0eb055e84ebc077ec730145
 RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn
 
 FROM $GO_RUNTIME
 
-ARG VERSION=knative-v1.19
+ARG VERSION=
 
 COPY --from=builder /usr/bin/main /ko-app/kn
 COPY LICENSE /licenses/
 
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-client-kn-rhel8-container" \
-      name="openshift-serverless-1/client-kn-rhel8" \
+      com.redhat.component="openshift-serverless-1-kn-rhel9-container" \
+      name="openshift-serverless-1/kn-rhel9" \
       version=$VERSION \
-      summary="Red Hat OpenShift Serverless 1 Client Kn" \
+      summary="Red Hat OpenShift Serverless 1 Kn" \
       maintainer="[email protected]" \
-      description="Red Hat OpenShift Serverless 1 Client Kn" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Kn" \
-      io.k8s.description="Red Hat OpenShift Serverless Client Kn" \
-      io.openshift.tags="kn"
+      description="Red Hat OpenShift Serverless 1 Kn" \
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Kn" \
+      io.k8s.description="Red Hat OpenShift Serverless Kn" \
+      io.openshift.tags="kn" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"
 
 ENTRYPOINT ["/ko-app/kn"]

openshift/ci-operator/knative-images/kn/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for test/test_images/helloworld.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -9,29 +9,29 @@ COPY . .
 
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT=strictfipsruntime
-ENV GOFLAGS=''
+ENV GOFLAGS='-mod=mod'
 
-RUN GOWORK=off go mod vendor
 RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/helloworld
 
 FROM $GO_RUNTIME
 
-ARG VERSION=knative-v1.19
+ARG VERSION=
 
 COPY --from=builder /usr/bin/main /ko-app/helloworld
 COPY LICENSE /licenses/
 
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-client-test-test-images-helloworld-rhel8-container" \
-      name="openshift-serverless-1/client-test-test-images-helloworld-rhel8" \
+      com.redhat.component="openshift-serverless-1-test-test-images-helloworld-rhel9-container" \
+      name="openshift-serverless-1/test-test-images-helloworld-rhel9" \
       version=$VERSION \
-      summary="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
+      summary="Red Hat OpenShift Serverless 1 Test Test Images Helloworld" \
       maintainer="[email protected]" \
-      description="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
-      io.k8s.description="Red Hat OpenShift Serverless Client Test Test Images Helloworld" \
-      io.openshift.tags="test-test-images-helloworld"
+      description="Red Hat OpenShift Serverless 1 Test Test Images Helloworld" \
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Test Test Images Helloworld" \
+      io.k8s.description="Red Hat OpenShift Serverless Test Test Images Helloworld" \
+      io.openshift.tags="test-test-images-helloworld" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"
 
 ENTRYPOINT ["/ko-app/helloworld"]