[release-v1.15] fix: correct clusterrole permissions (knative-extensi…

…ons#4016) (#1158) * fix: correct clusterrole permissions (knative-extensions#4016) Signed-off-by: Calum Murray <[email protected]> * Run make generate-release Signed-off-by: Pierangelo Di Pilato <[email protected]> --------- Signed-off-by: Calum Murray <[email protected]> Signed-off-by: Pierangelo Di Pilato <[email protected]> Co-authored-by: Pierangelo Di Pilato <[email protected]>
openshift-knative · Sep 16, 2024 · b9c5bfe · b9c5bfe
1 parent 3671b1d
commit b9c5bfe
Show file tree

Hide file tree

Showing 26 changed files with 99 additions and 161 deletions.
diff --git a/control-plane/config/post-install/200-controller-cluster-role.yaml b/control-plane/config/post-install/200-controller-cluster-role.yaml
@@ -28,6 +28,7 @@ rules:
       - "deployments"
     verbs:
       - "delete"
+      - "get"
       - "list"
   # we need to get statefulsets
   - apiGroups:

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/event_display/Dockerfile b/openshift/ci-operator/knative-images/event_display/Dockerfile
@@ -15,13 +15,10 @@ 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-kafka-broker-event-display-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-event-display-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/event_display"]
diff --git a/openshift/ci-operator/knative-images/heartbeats/Dockerfile b/openshift/ci-operator/knative-images/heartbeats/Dockerfile
@@ -15,13 +15,10 @@ 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-kafka-broker-heartbeats-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-heartbeats-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/heartbeats"]
diff --git a/openshift/ci-operator/knative-images/kafka-controller/Dockerfile b/openshift/ci-operator/knative-images/kafka-controller/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/kafka-controller
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-controller-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-kafka-controller-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/kafka-controller"]
diff --git a/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile b/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/kafka-source-controller
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-source-controller-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-kafka-source-controller-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/kafka-source-controller"]
diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile
@@ -15,13 +15,10 @@ 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-kafka-broker-migrate-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-migrate-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/migrate"]
diff --git a/openshift/ci-operator/knative-images/post-install/Dockerfile b/openshift/ci-operator/knative-images/post-install/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/post-install
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-post-install-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-post-install-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/post-install"]
diff --git a/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile b/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/webhook-kafka
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-webhook-kafka-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-webhook-kafka-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/webhook-kafka"]
diff --git a/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile b/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/committed-offset
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-committed-offset-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-test-test-images-committed-offset-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/committed-offset"]
diff --git a/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile b/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/consumer-group-lag-provider-test
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/consumer-group-lag-provider-test"]
diff --git a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/event-sender
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-event-sender-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-event-sender-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/event-sender"]
diff --git a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/eventshub
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-eventshub-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-eventshub-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/eventshub"]
diff --git a/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile b/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/kafka-consumer
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-kafka-consumer-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-test-test-images-kafka-consumer-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Kafka Consumer" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Kafka Consumer"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/kafka-consumer"]
diff --git a/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile b/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/logs-exporter
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-logs-exporter-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-logs-exporter-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Logs Exporter" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Logs Exporter"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/logs-exporter"]
diff --git a/openshift/ci-operator/knative-test-images/print/Dockerfile b/openshift/ci-operator/knative-test-images/print/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/print
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-print-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-print-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/print"]
diff --git a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/recordevents
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-recordevents-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-recordevents-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/recordevents"]
diff --git a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/request-sender
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-request-sender-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-request-sender-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/request-sender"]
diff --git a/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile b/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile
@@ -15,13 +15,10 @@ FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
-# Install zoneinfo.
-RUN microdnf install tzdata
+COPY --from=builder /usr/bin/main /usr/bin/watch-cm
 
 USER 65532
 
-COPY --from=builder /usr/bin/main /usr/bin/main
-
 LABEL \
       com.redhat.component="openshift-serverless-1-eventing-kafka-broker-watch-cm-rhel8-container" \
       name="openshift-serverless-1/eventing-kafka-broker-watch-cm-rhel8" \
@@ -31,4 +28,4 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Watch Cm" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Watch Cm"
 
-ENTRYPOINT ["/usr/bin/main"]
+ENTRYPOINT ["/usr/bin/watch-cm"]