diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml index d0f1ca26753c..761edda98714 100755 --- a/.tekton/docker-build.yaml +++ b/.tekton/docker-build.yaml @@ -1,7 +1,6 @@ apiVersion: tekton.dev/v1 kind: Pipeline metadata: - creationTimestamp: null labels: pipelines.openshift.io/runtime: generic pipelines.openshift.io/strategy: docker @@ -13,20 +12,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 +71,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 +83,14 @@ 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: "false" + description: Enable cache proxy configuration + name: enable-cache-proxy - default: [] description: Array of --build-arg values ("arg=value" strings) for buildah name: build-args @@ -208,6 +201,8 @@ spec: value: $(params.rebuild) - name: skip-checks value: $(params.skip-checks) + - name: enable-cache-proxy + value: $(params.enable-cache-proxy) taskRef: params: - name: name @@ -274,6 +269,14 @@ 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: HTTP_PROXY + value: $(tasks.init.results.http-proxy) + - name: NO_PROXY + value: $(tasks.init.results.no-proxy) - name: SOURCE_ARTIFACT value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) - name: CACHI2_ARTIFACT @@ -309,6 +312,8 @@ spec: - name: IMAGES value: - $(tasks.build-images.results.IMAGE_REF[*]) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) runAfter: - build-images taskRef: @@ -377,7 +382,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 +409,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/activator/Dockerfile b/openshift/ci-operator/knative-images/activator/Dockerfile index d19b657547a2..ad193702e02f 100755 --- a/openshift/ci-operator/knative-images/activator/Dockerfile +++ b/openshift/ci-operator/knative-images/activator/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-activator-rhel8-container" \ - name="openshift-serverless-1/serving-activator-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-activator-rhel8-container" \ + name="openshift-serverless-1/kn-serving-activator-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Activator" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Activator" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Activator" \ io.k8s.description="Red Hat OpenShift Serverless Serving Activator" \ - io.openshift.tags="activator" - + io.openshift.tags="activator" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/activator"] diff --git a/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile b/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile index 4d95a3d17cee..fae2d480b5fd 100755 --- a/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile +++ b/openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-autoscaler-hpa-rhel8-container" \ - name="openshift-serverless-1/serving-autoscaler-hpa-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-autoscaler-hpa-rhel8-container" \ + name="openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Autoscaler Hpa" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Autoscaler Hpa" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Autoscaler Hpa" \ io.k8s.description="Red Hat OpenShift Serverless Serving Autoscaler Hpa" \ - io.openshift.tags="autoscaler-hpa" - + io.openshift.tags="autoscaler-hpa" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/autoscaler-hpa"] diff --git a/openshift/ci-operator/knative-images/autoscaler/Dockerfile b/openshift/ci-operator/knative-images/autoscaler/Dockerfile index 3f6aedac2dcd..f9ef7ea5b1fc 100755 --- a/openshift/ci-operator/knative-images/autoscaler/Dockerfile +++ b/openshift/ci-operator/knative-images/autoscaler/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-autoscaler-rhel8-container" \ - name="openshift-serverless-1/serving-autoscaler-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-autoscaler-rhel8-container" \ + name="openshift-serverless-1/kn-serving-autoscaler-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Autoscaler" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Autoscaler" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Autoscaler" \ io.k8s.description="Red Hat OpenShift Serverless Serving Autoscaler" \ - io.openshift.tags="autoscaler" - + io.openshift.tags="autoscaler" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/autoscaler"] diff --git a/openshift/ci-operator/knative-images/cleanup/Dockerfile b/openshift/ci-operator/knative-images/cleanup/Dockerfile index 0f6ed8d22875..72999009785d 100755 --- a/openshift/ci-operator/knative-images/cleanup/Dockerfile +++ b/openshift/ci-operator/knative-images/cleanup/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Cleanup" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Cleanup" \ io.k8s.description="Red Hat OpenShift Serverless Serving Cleanup" \ - io.openshift.tags="cleanup" - + io.openshift.tags="cleanup" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/cleanup"] diff --git a/openshift/ci-operator/knative-images/controller/Dockerfile b/openshift/ci-operator/knative-images/controller/Dockerfile index d12e5548a0de..b4657a0ff344 100755 --- a/openshift/ci-operator/knative-images/controller/Dockerfile +++ b/openshift/ci-operator/knative-images/controller/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-controller-rhel8-container" \ - name="openshift-serverless-1/serving-controller-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-controller-rhel8-container" \ + name="openshift-serverless-1/kn-serving-controller-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Controller" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Controller" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Controller" \ io.k8s.description="Red Hat OpenShift Serverless Serving Controller" \ - io.openshift.tags="controller" - + io.openshift.tags="controller" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/controller"] diff --git a/openshift/ci-operator/knative-images/default-domain/Dockerfile b/openshift/ci-operator/knative-images/default-domain/Dockerfile index 64c72516e065..15388cbe9d5c 100755 --- a/openshift/ci-operator/knative-images/default-domain/Dockerfile +++ b/openshift/ci-operator/knative-images/default-domain/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Default Domain" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Default Domain" \ io.k8s.description="Red Hat OpenShift Serverless Serving Default Domain" \ - io.openshift.tags="default-domain" - + io.openshift.tags="default-domain" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/default-domain"] diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile index fd98bcbc48d6..a62a6c27e793 100755 --- a/openshift/ci-operator/knative-images/migrate/Dockerfile +++ b/openshift/ci-operator/knative-images/migrate/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-migrate-rhel8-container" \ - name="openshift-serverless-1/serving-migrate-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-storage-version-migration-rhel8-container" \ + name="openshift-serverless-1/kn-serving-storage-version-migration-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Migrate" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Migrate" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Migrate" \ io.k8s.description="Red Hat OpenShift Serverless Serving Migrate" \ - io.openshift.tags="migrate" - + io.openshift.tags="migrate" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/migrate"] diff --git a/openshift/ci-operator/knative-images/queue/Dockerfile b/openshift/ci-operator/knative-images/queue/Dockerfile index 7e2d248576e8..947dbedb9d8f 100755 --- a/openshift/ci-operator/knative-images/queue/Dockerfile +++ b/openshift/ci-operator/knative-images/queue/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-queue-rhel8-container" \ - name="openshift-serverless-1/serving-queue-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-queue-rhel8-container" \ + name="openshift-serverless-1/kn-serving-queue-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Queue" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Queue" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Queue" \ io.k8s.description="Red Hat OpenShift Serverless Serving Queue" \ - io.openshift.tags="queue" - + io.openshift.tags="queue" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/queue"] diff --git a/openshift/ci-operator/knative-images/webhook/Dockerfile b/openshift/ci-operator/knative-images/webhook/Dockerfile index 19f4854333b4..7ab5f193f24e 100755 --- a/openshift/ci-operator/knative-images/webhook/Dockerfile +++ b/openshift/ci-operator/knative-images/webhook/Dockerfile @@ -22,14 +22,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-serving-webhook-rhel8-container" \ - name="openshift-serverless-1/serving-webhook-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-serving-webhook-rhel8-container" \ + name="openshift-serverless-1/kn-serving-webhook-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Serving Webhook" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Serving Webhook" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Webhook" \ io.k8s.description="Red Hat OpenShift Serverless Serving Webhook" \ - io.openshift.tags="webhook" - + io.openshift.tags="webhook" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/webhook"] diff --git a/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile b/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile index 9d4b36c66f45..274eed9d5dd5 100755 --- a/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Dataplane Probe" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Dataplane Probe" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Dataplane Probe" \ - io.openshift.tags="test-performance-benchmarks-dataplane-probe" - + io.openshift.tags="test-performance-benchmarks-dataplane-probe" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/dataplane-probe"] diff --git a/openshift/ci-operator/knative-perf-images/load-test/Dockerfile b/openshift/ci-operator/knative-perf-images/load-test/Dockerfile index e32a04c410e3..9bb7853d8ae0 100755 --- a/openshift/ci-operator/knative-perf-images/load-test/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/load-test/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Load Test" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Load Test" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Load Test" \ - io.openshift.tags="test-performance-benchmarks-load-test" - + io.openshift.tags="test-performance-benchmarks-load-test" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/load-test"] diff --git a/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile b/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile index eb5db7cc6c5b..88df9a7cb92d 100755 --- a/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Real Traffic Test" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Real Traffic Test" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Real Traffic Test" \ - io.openshift.tags="test-performance-benchmarks-real-traffic-test" - + io.openshift.tags="test-performance-benchmarks-real-traffic-test" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/real-traffic-test"] diff --git a/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile b/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile index 6d31d243a641..ea0b8070cec7 100755 --- a/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Reconciliation Delay" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Reconciliation Delay" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Reconciliation Delay" \ - io.openshift.tags="test-performance-benchmarks-reconciliation-delay" - + io.openshift.tags="test-performance-benchmarks-reconciliation-delay" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/reconciliation-delay"] diff --git a/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile b/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile index eccd602b9bde..6e79b12b9395 100755 --- a/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Rollout Probe" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Rollout Probe" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Rollout Probe" \ - io.openshift.tags="test-performance-benchmarks-rollout-probe" - + io.openshift.tags="test-performance-benchmarks-rollout-probe" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/rollout-probe"] diff --git a/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile b/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile index 08fad970aa3f..ed72003c4b6c 100755 --- a/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile +++ b/openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Scale From Zero" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Scale From Zero" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Scale From Zero" \ - io.openshift.tags="test-performance-benchmarks-scale-from-zero" - + io.openshift.tags="test-performance-benchmarks-scale-from-zero" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/scale-from-zero"] diff --git a/openshift/ci-operator/knative-test-images/autoscale/Dockerfile b/openshift/ci-operator/knative-test-images/autoscale/Dockerfile index ed5029795b46..56461515d90b 100755 --- a/openshift/ci-operator/knative-test-images/autoscale/Dockerfile +++ b/openshift/ci-operator/knative-test-images/autoscale/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Autoscale" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Autoscale" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Autoscale" \ - io.openshift.tags="test-test-images-autoscale" - + io.openshift.tags="test-test-images-autoscale" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/autoscale"] diff --git a/openshift/ci-operator/knative-test-images/failing/Dockerfile b/openshift/ci-operator/knative-test-images/failing/Dockerfile index ebcd77208f39..f941ffff7ca4 100755 --- a/openshift/ci-operator/knative-test-images/failing/Dockerfile +++ b/openshift/ci-operator/knative-test-images/failing/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Failing" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Failing" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Failing" \ - io.openshift.tags="test-test-images-failing" - + io.openshift.tags="test-test-images-failing" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/failing"] diff --git a/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile b/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile index 53c12ecdda9a..46791e41ce18 100755 --- a/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile +++ b/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Grpc Ping" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Grpc Ping" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Grpc Ping" \ - io.openshift.tags="test-test-images-grpc-ping" - + io.openshift.tags="test-test-images-grpc-ping" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/grpc-ping"] diff --git a/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile b/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile index 6b2ee7e87d15..2410ebc9551a 100755 --- a/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile +++ b/openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Hellohttp2" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Hellohttp2" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Hellohttp2" \ - io.openshift.tags="test-test-images-hellohttp2" - + io.openshift.tags="test-test-images-hellohttp2" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/hellohttp2"] diff --git a/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile b/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile index 12db14118234..9958a727d925 100755 --- a/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile +++ b/openshift/ci-operator/knative-test-images/hellovolume/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Hellovolume" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Hellovolume" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Hellovolume" \ - io.openshift.tags="test-test-images-hellovolume" - + io.openshift.tags="test-test-images-hellovolume" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/hellovolume"] diff --git a/openshift/ci-operator/knative-test-images/helloworld/Dockerfile b/openshift/ci-operator/knative-test-images/helloworld/Dockerfile index 41f0e525a7ce..87851a9cae8d 100755 --- a/openshift/ci-operator/knative-test-images/helloworld/Dockerfile +++ b/openshift/ci-operator/knative-test-images/helloworld/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Helloworld" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Helloworld" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Helloworld" \ - io.openshift.tags="test-test-images-helloworld" - + io.openshift.tags="test-test-images-helloworld" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/helloworld"] diff --git a/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile b/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile index 5ef2a269d5ad..f15cddb748c5 100755 --- a/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile +++ b/openshift/ci-operator/knative-test-images/httpproxy/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Httpproxy" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Httpproxy" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Httpproxy" \ - io.openshift.tags="test-test-images-httpproxy" - + io.openshift.tags="test-test-images-httpproxy" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/httpproxy"] diff --git a/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile b/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile index d15be650916b..4dbdd3ce4005 100755 --- a/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile +++ b/openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Pizzaplanetv1" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Pizzaplanetv1" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Pizzaplanetv1" \ - io.openshift.tags="test-test-images-pizzaplanetv1" - + io.openshift.tags="test-test-images-pizzaplanetv1" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/pizzaplanetv1"] diff --git a/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile b/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile index 28e575e2fb88..e2c64524feda 100755 --- a/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile +++ b/openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Pizzaplanetv2" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Pizzaplanetv2" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Pizzaplanetv2" \ - io.openshift.tags="test-test-images-pizzaplanetv2" - + io.openshift.tags="test-test-images-pizzaplanetv2" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/pizzaplanetv2"] diff --git a/openshift/ci-operator/knative-test-images/readiness/Dockerfile b/openshift/ci-operator/knative-test-images/readiness/Dockerfile index a86afaf8f121..7fc0b3597fa5 100755 --- a/openshift/ci-operator/knative-test-images/readiness/Dockerfile +++ b/openshift/ci-operator/knative-test-images/readiness/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Readiness" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Readiness" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Readiness" \ - io.openshift.tags="test-test-images-readiness" - + io.openshift.tags="test-test-images-readiness" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/readiness"] diff --git a/openshift/ci-operator/knative-test-images/revisionfailure/Dockerfile b/openshift/ci-operator/knative-test-images/revisionfailure/Dockerfile index 591026d6bd7d..c33e3972ce17 100755 --- a/openshift/ci-operator/knative-test-images/revisionfailure/Dockerfile +++ b/openshift/ci-operator/knative-test-images/revisionfailure/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Revisionfailure" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Revisionfailure" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Revisionfailure" \ - io.openshift.tags="test-test-images-revisionfailure" - + io.openshift.tags="test-test-images-revisionfailure" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/revisionfailure"] diff --git a/openshift/ci-operator/knative-test-images/runtime/Dockerfile b/openshift/ci-operator/knative-test-images/runtime/Dockerfile index 301202a4b913..55e56f483a23 100755 --- a/openshift/ci-operator/knative-test-images/runtime/Dockerfile +++ b/openshift/ci-operator/knative-test-images/runtime/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Runtime" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Runtime" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Runtime" \ - io.openshift.tags="test-test-images-runtime" - + io.openshift.tags="test-test-images-runtime" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/runtime"] diff --git a/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile b/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile index 9c29a4e27d75..ba859a4c44b2 100755 --- a/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Multicontainer Servingcontainer" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Multicontainer Servingcontainer" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Multicontainer Servingcontainer" \ - io.openshift.tags="test-test-images-multicontainer-servingcontainer" - + io.openshift.tags="test-test-images-multicontainer-servingcontainer" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/servingcontainer"] diff --git a/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile b/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile index ae7d88c8a5e1..260080c4eb57 100755 --- a/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Multicontainer Sidecarcontainer" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Multicontainer Sidecarcontainer" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Multicontainer Sidecarcontainer" \ - io.openshift.tags="test-test-images-multicontainer-sidecarcontainer" - + io.openshift.tags="test-test-images-multicontainer-sidecarcontainer" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/sidecarcontainer"] diff --git a/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile b/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile index 29e3393d7aba..7752fc1d637b 100755 --- a/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile +++ b/openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Singlethreaded" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Singlethreaded" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Singlethreaded" \ - io.openshift.tags="test-test-images-singlethreaded" - + io.openshift.tags="test-test-images-singlethreaded" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/singlethreaded"] diff --git a/openshift/ci-operator/knative-test-images/slowstart/Dockerfile b/openshift/ci-operator/knative-test-images/slowstart/Dockerfile index dcd6549844f6..a7b47170a9a0 100755 --- a/openshift/ci-operator/knative-test-images/slowstart/Dockerfile +++ b/openshift/ci-operator/knative-test-images/slowstart/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Slowstart" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Slowstart" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Slowstart" \ - io.openshift.tags="test-test-images-slowstart" - + io.openshift.tags="test-test-images-slowstart" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/slowstart"] diff --git a/openshift/ci-operator/knative-test-images/timeout/Dockerfile b/openshift/ci-operator/knative-test-images/timeout/Dockerfile index 23d1d1994dea..e06d1092c640 100755 --- a/openshift/ci-operator/knative-test-images/timeout/Dockerfile +++ b/openshift/ci-operator/knative-test-images/timeout/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Timeout" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Timeout" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Timeout" \ - io.openshift.tags="test-test-images-timeout" - + io.openshift.tags="test-test-images-timeout" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/timeout"] diff --git a/openshift/ci-operator/knative-test-images/volumes/Dockerfile b/openshift/ci-operator/knative-test-images/volumes/Dockerfile index f762543950d6..f1821d416ad1 100755 --- a/openshift/ci-operator/knative-test-images/volumes/Dockerfile +++ b/openshift/ci-operator/knative-test-images/volumes/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Volumes" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Volumes" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Volumes" \ - io.openshift.tags="test-test-images-volumes" - + io.openshift.tags="test-test-images-volumes" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/volumes"] diff --git a/openshift/ci-operator/knative-test-images/wsserver/Dockerfile b/openshift/ci-operator/knative-test-images/wsserver/Dockerfile index d180da319d43..9e362cadbfb8 100755 --- a/openshift/ci-operator/knative-test-images/wsserver/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wsserver/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Serving Test Test Images Wsserver" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Test Images Wsserver" \ io.k8s.description="Red Hat OpenShift Serverless Serving Test Test Images Wsserver" \ - io.openshift.tags="test-test-images-wsserver" - + io.openshift.tags="test-test-images-wsserver" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.35::el8" + ENTRYPOINT ["/ko-app/wsserver"]