Run make generate-release (#869)

Co-authored-by: pierDipi <pierDipi@users.noreply.github.com>
openshift-knative · Sep 17, 2024 · 4c9d28c · 4c9d28c
1 parent 38c3f25
commit 4c9d28c
Show file tree

Hide file tree

Showing 29 changed files with 148 additions and 178 deletions.
diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile
@@ -1,16 +1,17 @@
 # DO NOT EDIT! Generated Dockerfile.
 
+FROM registry.ci.openshift.org/ocp/4.17: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.22-openshift-4.17 as builder
 
-RUN echo "[kubernetes]" >> /etc/yum.repos.d/kubernetes.repo && \
-    echo "name=Kubernetes" >> /etc/yum.repos.d/kubernetes.repo && \
-    echo "baseurl=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/" >> /etc/yum.repos.d/kubernetes.repo && \
-    echo "enabled=1" >> /etc/yum.repos.d/kubernetes.repo && \
-    echo "gpgcheck=1" >> /etc/yum.repos.d/kubernetes.repo && \
-    echo "gpgkey=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/repodata/repomd.xml.key" >> /etc/yum.repos.d/kubernetes.repo
+ARG TARGETARCH
+
+COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
 
-RUN yum install -y kubectl httpd-tools
+RUN ln -s /usr/bin/oc /usr/bin/kubectl
+
+RUN yum install -y httpd-tools
 
 RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
     chmod 700 ./get-helm-3
@@ -22,6 +23,3 @@ RUN GOFLAGS='' go install github.com/mikefarah/yq/v3@latest
 # go install creates $GOPATH/.cache with root permissions, we delete it here
 # to avoid permission issues with the runtime users
 RUN rm -rf $GOPATH/.cache
-
-# Allow runtime users to add entries to /etc/passwd
-RUN chmod g+rw /etc/passwd
diff --git a/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile b/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/apiserver_receive_adapter
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-apiserver-receive-adapter-rhel8-container" \
       name="openshift-serverless-1/eventing-apiserver-receive-adapter-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Apiserver Receive Adapter" \
+      io.openshift.tags="apiserver-receive-adapter"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/apiserver_receive_adapter"]
diff --git a/openshift/ci-operator/knative-images/appender/Dockerfile b/openshift/ci-operator/knative-images/appender/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/appender
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-appender-rhel8-container" \
       name="openshift-serverless-1/eventing-appender-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Appender" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Appender" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Appender"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Appender" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Appender" \
+      io.openshift.tags="appender"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/appender"]
diff --git a/openshift/ci-operator/knative-images/channel_controller/Dockerfile b/openshift/ci-operator/knative-images/channel_controller/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/channel_controller
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-controller-rhel8-container" \
       name="openshift-serverless-1/eventing-in-memory-channel-controller-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing In Memory Channel Controller" \
+      io.openshift.tags="in-memory-channel-controller"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/channel_controller"]
diff --git a/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile b/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/channel_dispatcher
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-dispatcher-rhel8-container" \
       name="openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing In Memory Channel Dispatcher" \
+      io.openshift.tags="in-memory-channel-dispatcher"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/channel_dispatcher"]
diff --git a/openshift/ci-operator/knative-images/controller/Dockerfile b/openshift/ci-operator/knative-images/controller/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/controller
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-controller-rhel8-container" \
       name="openshift-serverless-1/eventing-controller-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Controller" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Controller" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Controller"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Controller" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Controller" \
+      io.openshift.tags="controller"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/controller"]
diff --git a/openshift/ci-operator/knative-images/event_display/Dockerfile b/openshift/ci-operator/knative-images/event_display/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/event_display
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-event-display-rhel8-container" \
       name="openshift-serverless-1/eventing-event-display-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Event Display" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Event Display" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Event Display"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Event Display" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Event Display" \
+      io.openshift.tags="event-display"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/event_display"]
diff --git a/openshift/ci-operator/knative-images/filter/Dockerfile b/openshift/ci-operator/knative-images/filter/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/filter
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-broker-filter-rhel8-container" \
       name="openshift-serverless-1/eventing-broker-filter-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Filter"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Broker Filter" \
+      io.openshift.tags="broker-filter"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/filter"]
diff --git a/openshift/ci-operator/knative-images/heartbeats/Dockerfile b/openshift/ci-operator/knative-images/heartbeats/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/heartbeats
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-heartbeats-rhel8-container" \
       name="openshift-serverless-1/eventing-heartbeats-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Heartbeats" \
+      io.openshift.tags="heartbeats"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/heartbeats"]
diff --git a/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile b/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/heartbeats_receiver
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-heartbeats-receiver-rhel8-container" \
       name="openshift-serverless-1/eventing-heartbeats-receiver-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Heartbeats Receiver" \
+      io.openshift.tags="heartbeats-receiver"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/heartbeats_receiver"]
diff --git a/openshift/ci-operator/knative-images/ingress/Dockerfile b/openshift/ci-operator/knative-images/ingress/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/ingress
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-broker-ingress-rhel8-container" \
       name="openshift-serverless-1/eventing-broker-ingress-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Ingress"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Broker Ingress" \
+      io.openshift.tags="broker-ingress"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/ingress"]
diff --git a/openshift/ci-operator/knative-images/jobsink/Dockerfile b/openshift/ci-operator/knative-images/jobsink/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/jobsink
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-jobsink-rhel8-container" \
       name="openshift-serverless-1/eventing-jobsink-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Jobsink" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Jobsink" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Jobsink"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Jobsink" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Jobsink" \
+      io.openshift.tags="jobsink"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/jobsink"]
diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/migrate
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-migrate-rhel8-container" \
       name="openshift-serverless-1/eventing-migrate-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Migrate" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Migrate" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Migrate"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Migrate" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Migrate" \
+      io.openshift.tags="migrate"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/migrate"]
diff --git a/openshift/ci-operator/knative-images/mqttsource/Dockerfile b/openshift/ci-operator/knative-images/mqttsource/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/mqttsource
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-mqttsource-rhel8-container" \
       name="openshift-serverless-1/eventing-mqttsource-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Mqttsource" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Mqttsource" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Mqttsource"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Mqttsource" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Mqttsource" \
+      io.openshift.tags="mqttsource"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/mqttsource"]
diff --git a/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile b/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile
@@ -15,20 +15,19 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/mtchannel_broker
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-mtchannel-broker-rhel8-container" \
       name="openshift-serverless-1/eventing-mtchannel-broker-rhel8" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Mtchannel Broker" \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless 1 Eventing Mtchannel Broker" \
-      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Mtchannel Broker"
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Mtchannel Broker" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Mtchannel Broker" \
+      io.openshift.tags="mtchannel-broker"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/mtchannel_broker"]