diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml index 0b84651364..b361a799d3 100755 --- a/.tekton/docker-build.yaml +++ b/.tekton/docker-build.yaml @@ -13,20 +13,6 @@ spec: _Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://conforma.dev/docs/policy/packages/release_trusted_task.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks. This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-multi-platform-oci-ta?tab=tags)_ - finally: - - name: show-sbom - params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - taskRef: - params: - - name: name - value: show-sbom - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7 - - name: kind - value: task - resolver: bundles params: - default: - linux/x86_64 @@ -86,7 +72,7 @@ spec: name: hermetic type: string - default: "" - description: Build dependencies to be prefetched by Cachi2 + description: Build dependencies to be prefetched name: prefetch-input type: string - default: "" @@ -98,6 +84,11 @@ spec: description: Add built image into an OCI image index name: build-image-index type: string + - default: docker + description: The format for the resulting image's mediaType. Valid values are + oci or docker. + name: buildah-format + type: string - default: [] description: Array of --build-arg values ("arg=value" strings) for buildah name: build-args @@ -274,6 +265,10 @@ spec: value: $(params.build-args-file) - name: PRIVILEGED_NESTED value: $(params.privileged-nested) + - name: SOURCE_URL + value: $(tasks.clone-repository.results.url) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) - name: SOURCE_ARTIFACT value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) - name: CACHI2_ARTIFACT @@ -309,6 +304,8 @@ spec: - name: IMAGES value: - $(tasks.build-images.results.IMAGE_REF[*]) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) runAfter: - build-images taskRef: @@ -377,7 +374,12 @@ spec: operator: in values: - "false" - - name: clair-scan + - matrix: + params: + - name: image-platform + value: + - $(params.build-platforms) + name: clair-scan params: - name: image-digest value: $(tasks.build-image-index.results.IMAGE_DIGEST) @@ -399,7 +401,12 @@ spec: operator: in values: - "false" - - name: ecosystem-cert-preflight-checks + - matrix: + params: + - name: platform + value: + - $(params.build-platforms) + name: ecosystem-cert-preflight-checks params: - name: image-url value: $(tasks.build-image-index.results.IMAGE_URL) diff --git a/.tekton/docker-java-build.yaml b/.tekton/docker-java-build.yaml index f8390fe76a..f196fb61f4 100755 --- a/.tekton/docker-java-build.yaml +++ b/.tekton/docker-java-build.yaml @@ -13,20 +13,6 @@ spec: _Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://conforma.dev/docs/policy/packages/release_trusted_task.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks. This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-multi-platform-oci-ta?tab=tags)_ - finally: - - name: show-sbom - params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - taskRef: - params: - - name: name - value: show-sbom - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7 - - name: kind - value: task - resolver: bundles params: - default: - linux/x86_64 @@ -86,7 +72,7 @@ spec: name: hermetic type: string - default: "" - description: Build dependencies to be prefetched by Cachi2 + description: Build dependencies to be prefetched name: prefetch-input type: string - default: "" @@ -98,6 +84,11 @@ spec: description: Add built image into an OCI image index name: build-image-index type: string + - default: docker + description: The format for the resulting image's mediaType. Valid values are + oci or docker. + name: buildah-format + type: string - default: [] description: Array of --build-arg values ("arg=value" strings) for buildah name: build-args @@ -231,6 +222,10 @@ spec: value: $(params.build-args-file) - name: PRIVILEGED_NESTED value: $(params.privileged-nested) + - name: SOURCE_URL + value: $(tasks.clone-repository.results.url) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) - name: SOURCE_ARTIFACT value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) - name: CACHI2_ARTIFACT @@ -387,6 +382,8 @@ spec: - name: IMAGES value: - $(tasks.build-images.results.IMAGE_REF[*]) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) runAfter: - build-images taskRef: @@ -455,7 +452,12 @@ spec: operator: in values: - "false" - - name: clair-scan + - matrix: + params: + - name: image-platform + value: + - $(params.build-platforms) + name: clair-scan params: - name: image-digest value: $(tasks.build-image-index.results.IMAGE_DIGEST) @@ -477,7 +479,12 @@ spec: operator: in values: - "false" - - name: ecosystem-cert-preflight-checks + - matrix: + params: + - name: platform + value: + - $(params.build-platforms) + name: ecosystem-cert-preflight-checks params: - name: image-url value: $(tasks.build-image-index.results.IMAGE_URL) diff --git a/openshift/ci-operator/knative-images/event_display/Dockerfile b/openshift/ci-operator/knative-images/event_display/Dockerfile index 74b2132882..46ac3442b6 100755 --- a/openshift/ci-operator/knative-images/event_display/Dockerfile +++ b/openshift/ci-operator/knative-images/event_display/Dockerfile @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Event Display" \ - io.openshift.tags="event-display" - + io.openshift.tags="event-display" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/event_display"] diff --git a/openshift/ci-operator/knative-images/heartbeats/Dockerfile b/openshift/ci-operator/knative-images/heartbeats/Dockerfile index 3137e15ed1..43853291cb 100755 --- a/openshift/ci-operator/knative-images/heartbeats/Dockerfile +++ b/openshift/ci-operator/knative-images/heartbeats/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Heartbeats" \ - io.openshift.tags="heartbeats" - + io.openshift.tags="heartbeats" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/heartbeats"] diff --git a/openshift/ci-operator/knative-images/kafka-controller/Dockerfile b/openshift/ci-operator/knative-images/kafka-controller/Dockerfile index 1496f2c256..f0d3868ff7 100755 --- a/openshift/ci-operator/knative-images/kafka-controller/Dockerfile +++ b/openshift/ci-operator/knative-images/kafka-controller/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-controller-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-kafka-controller-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-ekb-kafka-controller-rhel8-container" \ + name="openshift-serverless-1/kn-ekb-kafka-controller-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \ maintainer="serverless-support@redhat.com" \ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Kafka Controller" \ - io.openshift.tags="kafka-controller" - + io.openshift.tags="kafka-controller" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index 23acadfdf6..260cae835e 100755 --- a/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile +++ b/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Kafka Source Controller" \ - io.openshift.tags="kafka-source-controller" - + io.openshift.tags="kafka-source-controller" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/kafka-source-controller"] diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile index 7be9b824ec..e330c399e1 100755 --- a/openshift/ci-operator/knative-images/migrate/Dockerfile +++ b/openshift/ci-operator/knative-images/migrate/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Migrate" \ - io.openshift.tags="migrate" - + io.openshift.tags="migrate" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/migrate"] diff --git a/openshift/ci-operator/knative-images/post-install/Dockerfile b/openshift/ci-operator/knative-images/post-install/Dockerfile index 3fb45de0b5..f5ab912ac2 100755 --- a/openshift/ci-operator/knative-images/post-install/Dockerfile +++ b/openshift/ci-operator/knative-images/post-install/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-post-install-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-post-install-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-ekb-post-install-rhel8-container" \ + name="openshift-serverless-1/kn-ekb-post-install-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \ maintainer="serverless-support@redhat.com" \ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Post Install" \ - io.openshift.tags="post-install" - + io.openshift.tags="post-install" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index c652172d5d..7193976e0b 100755 --- a/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile +++ b/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-webhook-kafka-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-webhook-kafka-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-ekb-webhook-kafka-rhel8-container" \ + name="openshift-serverless-1/kn-ekb-webhook-kafka-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \ maintainer="serverless-support@redhat.com" \ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Webhook Kafka" \ - io.openshift.tags="webhook-kafka" - + io.openshift.tags="webhook-kafka" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index 747a3af5b9..603cfdaeaa 100755 --- a/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile +++ b/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Committed Offset" \ - io.openshift.tags="test-test-images-committed-offset" - + io.openshift.tags="test-test-images-committed-offset" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index cdd432c762..8f70b206c3 100755 --- 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 @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \ - io.openshift.tags="test-test-images-consumer-group-lag-provider-test" - + io.openshift.tags="test-test-images-consumer-group-lag-provider-test" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index c1094bd82d..f2fcf25533 100755 --- a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-event-sender" - + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-event-sender" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index a9f6f949bb..1f9c10e2aa 100755 --- a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile +++ b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Eventshub" \ - io.openshift.tags="eventshub" - + io.openshift.tags="eventshub" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index 07c6a27b6a..3c7b167917 100755 --- a/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Kafka Consumer" \ - io.openshift.tags="test-test-images-kafka-consumer" - + io.openshift.tags="test-test-images-kafka-consumer" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index 6087f3fea9..bf55ec1104 100755 --- a/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile +++ b/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Logs Exporter" \ - io.openshift.tags="logs-exporter" - + io.openshift.tags="logs-exporter" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index af56f80320..6100839f34 100755 --- a/openshift/ci-operator/knative-test-images/print/Dockerfile +++ b/openshift/ci-operator/knative-test-images/print/Dockerfile @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-print" - + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-print" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/print"] diff --git a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile index 832f75ef92..6db784221e 100755 --- a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile +++ b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-recordevents" - + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-recordevents" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index 8d8d1a9f9b..2ec389b290 100755 --- a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-request-sender" - + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-request-sender" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + 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 index b5e5814622..c72f36c04a 100755 --- a/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile +++ b/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile @@ -30,6 +30,9 @@ 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" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Watch Cm" \ - io.openshift.tags="watch-cm" - + io.openshift.tags="watch-cm" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/watch-cm"] diff --git a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile index 92c47ad9d7..0be85fb9d8 100755 --- a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-fetcher" - + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-fetcher" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/wathola-fetcher"] diff --git a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile index b99e801b7e..5958d18c73 100755 --- a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-forwarder" - + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-forwarder" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/wathola-forwarder"] diff --git a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile index c581c32cbe..2138321293 100755 --- a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-receiver" - + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-receiver" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/wathola-receiver"] diff --git a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile index d723f60c83..ba52ace331 100755 --- a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-sender" - + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-sender" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/usr/bin/wathola-sender"]