diff --git a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-activator.yaml b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-activator.yaml index bc486d73a6da..97c519c8c584 100755 --- a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-activator.yaml +++ b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-activator.yaml @@ -2,10 +2,7 @@ apiVersion: appstudio.redhat.com/v1alpha1 kind: Component metadata: annotations: - image.redhat.com/generate: "true" - appstudio.openshift.io/pac-provision: request build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}' - build.appstudio.openshift.io/request: configure-pac name: knative-serving-activator-release-next spec: componentName: knative-serving-activator diff --git a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-autoscaler-hpa.yaml b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-autoscaler-hpa.yaml index 386e3bf87b1f..0861b6803d3f 100755 --- a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-autoscaler-hpa.yaml +++ b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-autoscaler-hpa.yaml @@ -2,10 +2,7 @@ apiVersion: appstudio.redhat.com/v1alpha1 kind: Component metadata: annotations: - image.redhat.com/generate: "true" - appstudio.openshift.io/pac-provision: request build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}' - build.appstudio.openshift.io/request: configure-pac name: knative-serving-autoscaler-hpa-release-next spec: componentName: knative-serving-autoscaler-hpa diff --git a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-autoscaler.yaml b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-autoscaler.yaml index b98ac20044f5..87a5c38432a9 100755 --- a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-autoscaler.yaml +++ b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-autoscaler.yaml @@ -2,10 +2,7 @@ apiVersion: appstudio.redhat.com/v1alpha1 kind: Component metadata: annotations: - image.redhat.com/generate: "true" - appstudio.openshift.io/pac-provision: request build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}' - build.appstudio.openshift.io/request: configure-pac name: knative-serving-autoscaler-release-next spec: componentName: knative-serving-autoscaler diff --git a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-controller.yaml b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-controller.yaml index 7abf3fbb2a0b..53332782ef65 100755 --- a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-controller.yaml +++ b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-controller.yaml @@ -2,10 +2,7 @@ apiVersion: appstudio.redhat.com/v1alpha1 kind: Component metadata: annotations: - image.redhat.com/generate: "true" - appstudio.openshift.io/pac-provision: request build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}' - build.appstudio.openshift.io/request: configure-pac name: knative-serving-controller-release-next spec: componentName: knative-serving-controller diff --git a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-queue.yaml b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-queue.yaml index 7345b119f46e..356372a1baad 100755 --- a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-queue.yaml +++ b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-queue.yaml @@ -2,10 +2,7 @@ apiVersion: appstudio.redhat.com/v1alpha1 kind: Component metadata: annotations: - image.redhat.com/generate: "true" - appstudio.openshift.io/pac-provision: request build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}' - build.appstudio.openshift.io/request: configure-pac name: knative-serving-queue-release-next spec: componentName: knative-serving-queue diff --git a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-storage-version-migration.yaml b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-storage-version-migration.yaml index 7876a7ce8eab..f0cab7aafc57 100755 --- a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-storage-version-migration.yaml +++ b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-storage-version-migration.yaml @@ -2,10 +2,7 @@ apiVersion: appstudio.redhat.com/v1alpha1 kind: Component metadata: annotations: - image.redhat.com/generate: "true" - appstudio.openshift.io/pac-provision: request build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}' - build.appstudio.openshift.io/request: configure-pac name: knative-serving-storage-version-migration-release-next spec: componentName: knative-serving-storage-version-migration diff --git a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-webhook.yaml b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-webhook.yaml index 4098c14d90cd..b8fa0494ec27 100755 --- a/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-webhook.yaml +++ b/.konflux/applications/serverless-operator-release-next/components/openshift-knative-serving-release-next-knative-serving-webhook.yaml @@ -2,10 +2,7 @@ apiVersion: appstudio.redhat.com/v1alpha1 kind: Component metadata: annotations: - image.redhat.com/generate: "true" - appstudio.openshift.io/pac-provision: request build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}' - build.appstudio.openshift.io/request: configure-pac name: knative-serving-webhook-release-next spec: componentName: knative-serving-webhook diff --git a/.tekton/docker-build-oci-ta.yaml b/.tekton/docker-build.yaml similarity index 82% rename from .tekton/docker-build-oci-ta.yaml rename to .tekton/docker-build.yaml index 18232fd233f3..eb07e4128a6b 100755 --- a/.tekton/docker-build-oci-ta.yaml +++ b/.tekton/docker-build.yaml @@ -6,7 +6,7 @@ metadata: pipelines.openshift.io/runtime: generic pipelines.openshift.io/strategy: docker pipelines.openshift.io/used-by: build-cloud - name: docker-build-oci-ta + name: docker-build spec: finally: - name: show-sbom @@ -22,6 +22,28 @@ spec: - name: kind value: task resolver: bundles + - name: show-summary + params: + - name: pipelinerun-name + value: $(context.pipelineRun.name) + - name: git-url + value: $(tasks.clone-repository.results.url)?rev=$(tasks.clone-repository.results.commit) + - name: image-url + value: $(params.output-image) + - name: build-task-status + value: $(tasks.build-container.status) + taskRef: + params: + - name: name + value: summary + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:d97c04ab42f277b1103eb6f3a053b247849f4f5b3237ea302a8ecada3b24e15b + - name: kind + value: task + resolver: bundles + workspaces: + - name: workspace + workspace: workspace params: - description: Source Repository URL name: git-url @@ -119,18 +141,14 @@ spec: value: $(params.git-url) - name: revision value: $(params.revision) - - name: ociStorage - value: $(params.output-image).git - - name: ociArtifactExpiresAfter - value: $(params.image-expires-after) runAfter: - init taskRef: params: - name: name - value: git-clone-oci-ta + value: git-clone - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0f4360ce144d46171ebd2e8f4d4575539a0600e02208ba5fc9beeb2c27ddfd4c + value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814 - name: kind value: task resolver: bundles @@ -140,26 +158,22 @@ spec: values: - "true" workspaces: + - name: output + workspace: workspace - name: basic-auth workspace: git-auth - name: prefetch-dependencies params: - name: input value: $(params.prefetch-input) - - name: SOURCE_ARTIFACT - value: $(tasks.clone-repository.results.SOURCE_ARTIFACT) - - name: ociStorage - value: $(params.output-image).prefetch - - name: ociArtifactExpiresAfter - value: $(params.image-expires-after) runAfter: - clone-repository taskRef: params: - name: name - value: prefetch-dependencies-oci-ta + value: prefetch-dependencies - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.1@sha256:34a2a8b700bfdfddc4a3e6328f0f8ba29eb2de89a921e24d05c39cc6c5d05351 + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.1@sha256:2bbeb1fa9eaa1b02c56524ff5ccd137a28d59626b7eedc1d3e714b69e4e17ac7 - name: kind value: task resolver: bundles @@ -169,6 +183,8 @@ spec: values: - "" workspaces: + - name: source + workspace: workspace - name: git-basic-auth workspace: git-auth - name: netrc @@ -194,18 +210,14 @@ spec: - $(params.build-args[*]) - name: BUILD_ARGS_FILE value: $(params.build-args-file) - - name: SOURCE_ARTIFACT - value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) - - name: CACHI2_ARTIFACT - value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT) runAfter: - prefetch-dependencies taskRef: params: - name: name - value: buildah-oci-ta + value: buildah - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:3ccc7122935a0f24f02276b216bf9dc02dc2da4ef9cdb9263f05c34c003c7532 + value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:67963bcd91b23ee90f2c4ecb8b7f523c457f6c350df17bc192480dbd085a241d - name: kind value: task resolver: bundles @@ -214,22 +226,21 @@ spec: operator: in values: - "true" + workspaces: + - name: source + workspace: workspace - name: build-source-image params: - name: BINARY_IMAGE value: $(params.output-image) - - name: SOURCE_ARTIFACT - value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) - - name: CACHI2_ARTIFACT - value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT) runAfter: - build-container taskRef: params: - name: name - value: source-build-oci-ta + value: source-build - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:99ee22c5e8e8a66da3d68ec5f3334e7cc59f8b8907e9d2a78f7338aa37d952eb + value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.1@sha256:1cb3423593145e899b784000f6ae90e121763ce98c26f6fc049f5dee2310f805 - name: kind value: task resolver: bundles @@ -242,6 +253,9 @@ spec: operator: in values: - "true" + workspaces: + - name: workspace + workspace: workspace - name: deprecated-base-image-check params: - name: IMAGE_URL @@ -308,16 +322,18 @@ spec: - "false" - name: sast-snyk-check params: - - name: SOURCE_ARTIFACT - value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) + - name: image-digest + value: $(tasks.build-container.results.IMAGE_DIGEST) + - name: image-url + value: $(tasks.build-container.results.IMAGE_URL) runAfter: - build-container taskRef: params: - name: name - value: sast-snyk-check-oci-ta + value: sast-snyk-check - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.1@sha256:ab70a8249b7cbcf21ee5e5054f6cd26368d4270014ebd584c1bf31a382e9ed4f + value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.1@sha256:f15181d70187fe31489d474d790dfb09f8faedd93b88a36cb467a2c4c79159e0 - name: kind value: task resolver: bundles @@ -326,6 +342,9 @@ spec: operator: in values: - "false" + workspaces: + - name: workspace + workspace: workspace - name: clamav-scan params: - name: image-digest @@ -339,7 +358,7 @@ spec: - name: name value: clamav-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:b494d21c755f5142f74441df3dc204a1d357a0fc339ac5a8000b80dc983182f9 + value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:4cb5750b01759a4f3d02bb8c6869e80dcde7bd4c7f5c0a68dd18e57ea2ac676f - name: kind value: task resolver: bundles @@ -395,20 +414,22 @@ spec: value: $(params.dockerfile) - name: CONTEXT value: $(params.path-context) - - name: SOURCE_ARTIFACT - value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) runAfter: - build-container taskRef: params: - name: name - value: push-dockerfile-oci-ta + value: push-dockerfile - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:117ca1f960e8d003f9a5e144e90cacf1ec9d8b4dbdb3113516658d8020db72f2 + value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:81312124d27361cfa2d7ff09fb38a177b27b0e9b43426aa4ea9cec9f640ec42a - name: kind value: task resolver: bundles + workspaces: + - name: workspace + workspace: workspace workspaces: + - name: workspace - name: git-auth optional: true - name: netrc diff --git a/.tekton/knative-serving-activator-release-next-pull-request.yaml b/.tekton/knative-serving-activator-release-next-pull-request.yaml index e94cbeb2b500..4c96790e98af 100755 --- a/.tekton/knative-serving-activator-release-next-pull-request.yaml +++ b/.tekton/knative-serving-activator-release-next-pull-request.yaml @@ -29,7 +29,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-activator-release-next-push.yaml b/.tekton/knative-serving-activator-release-next-push.yaml index 305601d5bd09..3b9308a8a4c7 100755 --- a/.tekton/knative-serving-activator-release-next-push.yaml +++ b/.tekton/knative-serving-activator-release-next-push.yaml @@ -26,7 +26,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-autoscaler-hpa-release-next-pull-request.yaml b/.tekton/knative-serving-autoscaler-hpa-release-next-pull-request.yaml index 56675a62ca26..7796845f0ddf 100755 --- a/.tekton/knative-serving-autoscaler-hpa-release-next-pull-request.yaml +++ b/.tekton/knative-serving-autoscaler-hpa-release-next-pull-request.yaml @@ -29,7 +29,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-autoscaler-hpa-release-next-push.yaml b/.tekton/knative-serving-autoscaler-hpa-release-next-push.yaml index 40933f478e53..5f82c86b5f4e 100755 --- a/.tekton/knative-serving-autoscaler-hpa-release-next-push.yaml +++ b/.tekton/knative-serving-autoscaler-hpa-release-next-push.yaml @@ -26,7 +26,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-autoscaler-release-next-pull-request.yaml b/.tekton/knative-serving-autoscaler-release-next-pull-request.yaml index 188b424e98aa..2c5414dcaf77 100755 --- a/.tekton/knative-serving-autoscaler-release-next-pull-request.yaml +++ b/.tekton/knative-serving-autoscaler-release-next-pull-request.yaml @@ -29,7 +29,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-autoscaler-release-next-push.yaml b/.tekton/knative-serving-autoscaler-release-next-push.yaml index c3b2a1de3518..f0b5b8293f55 100755 --- a/.tekton/knative-serving-autoscaler-release-next-push.yaml +++ b/.tekton/knative-serving-autoscaler-release-next-push.yaml @@ -26,7 +26,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-controller-release-next-pull-request.yaml b/.tekton/knative-serving-controller-release-next-pull-request.yaml index d71099c01d17..cb5a0a38e358 100755 --- a/.tekton/knative-serving-controller-release-next-pull-request.yaml +++ b/.tekton/knative-serving-controller-release-next-pull-request.yaml @@ -29,7 +29,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-controller-release-next-push.yaml b/.tekton/knative-serving-controller-release-next-push.yaml index 56bdff2b6d38..48dce666b842 100755 --- a/.tekton/knative-serving-controller-release-next-push.yaml +++ b/.tekton/knative-serving-controller-release-next-push.yaml @@ -26,7 +26,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-queue-release-next-pull-request.yaml b/.tekton/knative-serving-queue-release-next-pull-request.yaml index d181c38174cb..7925cc8c4d3e 100755 --- a/.tekton/knative-serving-queue-release-next-pull-request.yaml +++ b/.tekton/knative-serving-queue-release-next-pull-request.yaml @@ -29,7 +29,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-queue-release-next-push.yaml b/.tekton/knative-serving-queue-release-next-push.yaml index ac89b4b7f81f..1b02ce254b74 100755 --- a/.tekton/knative-serving-queue-release-next-push.yaml +++ b/.tekton/knative-serving-queue-release-next-push.yaml @@ -26,7 +26,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-storage-version-migration-release-next-pull-request.yaml b/.tekton/knative-serving-storage-version-migration-release-next-pull-request.yaml index d57475dee08e..362df5098634 100755 --- a/.tekton/knative-serving-storage-version-migration-release-next-pull-request.yaml +++ b/.tekton/knative-serving-storage-version-migration-release-next-pull-request.yaml @@ -29,7 +29,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-storage-version-migration-release-next-push.yaml b/.tekton/knative-serving-storage-version-migration-release-next-push.yaml index 7584f206140a..f8e4dda890d0 100755 --- a/.tekton/knative-serving-storage-version-migration-release-next-push.yaml +++ b/.tekton/knative-serving-storage-version-migration-release-next-push.yaml @@ -26,7 +26,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-webhook-release-next-pull-request.yaml b/.tekton/knative-serving-webhook-release-next-pull-request.yaml index 7c2c539046bd..6f31f68bf7a2 100755 --- a/.tekton/knative-serving-webhook-release-next-pull-request.yaml +++ b/.tekton/knative-serving-webhook-release-next-pull-request.yaml @@ -29,7 +29,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace diff --git a/.tekton/knative-serving-webhook-release-next-push.yaml b/.tekton/knative-serving-webhook-release-next-push.yaml index 9391d3f9e431..6ee7931399ec 100755 --- a/.tekton/knative-serving-webhook-release-next-push.yaml +++ b/.tekton/knative-serving-webhook-release-next-push.yaml @@ -26,7 +26,7 @@ spec: - name: revision value: '{{revision}}' pipelineRef: - name: docker-build-oci-ta + name: docker-build taskRunTemplate: {} workspaces: - name: workspace