From 125ce40086323b446c57ee5330ff9cfc4043732e Mon Sep 17 00:00:00 2001 From: Isaac Date: Fri, 6 Jun 2025 10:57:39 +0200 Subject: [PATCH 1/8] Add missing task fbc-target-index-pruning-check --- ...-validation-operator-fbc-pull-request.yaml | 26 +++++++++++++++++++ ...ployment-validation-operator-fbc-push.yaml | 26 +++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/.tekton/deployment-validation-operator-fbc-pull-request.yaml b/.tekton/deployment-validation-operator-fbc-pull-request.yaml index c1894995..3a97dd32 100644 --- a/.tekton/deployment-validation-operator-fbc-pull-request.yaml +++ b/.tekton/deployment-validation-operator-fbc-pull-request.yaml @@ -267,6 +267,32 @@ spec: workspaces: - name: workspace workspace: workspace + - name: fbc-target-index-pruning-check + params: + - name: IMAGE_URL + value: $(tasks.build-image-index.results.IMAGE_URL) + - name: IMAGE_DIGEST + value: $(tasks.build-image-index.results.IMAGE_DIGEST) + - name: TARGET_INDEX + value: registry.redhat.io/redhat/redhat-operator-index + - name: RENDERED_CATALOG_DIGEST + value: $(tasks.validate-fbc.results.RENDERED_CATALOG_DIGEST) + runAfter: + - validate-fbc + taskRef: + params: + - name: name + value: fbc-target-index-pruning-check + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-fbc-target-index-pruning-check:0.1@sha256:016d0fa117dd2aa36420ebe74f938dda6cacb28d193d71775f6141dbab976cc6 + - name: kind + value: task + resolver: bundles + when: + - input: $(params.skip-checks) + operator: in + values: + - "false" - name: deprecated-base-image-check params: - name: IMAGE_URL diff --git a/.tekton/deployment-validation-operator-fbc-push.yaml b/.tekton/deployment-validation-operator-fbc-push.yaml index f1b77ec3..631543c2 100644 --- a/.tekton/deployment-validation-operator-fbc-push.yaml +++ b/.tekton/deployment-validation-operator-fbc-push.yaml @@ -263,6 +263,32 @@ spec: workspaces: - name: workspace workspace: workspace + - name: fbc-target-index-pruning-check + params: + - name: IMAGE_URL + value: $(tasks.build-image-index.results.IMAGE_URL) + - name: IMAGE_DIGEST + value: $(tasks.build-image-index.results.IMAGE_DIGEST) + - name: TARGET_INDEX + value: registry.redhat.io/redhat/redhat-operator-index + - name: RENDERED_CATALOG_DIGEST + value: $(tasks.validate-fbc.results.RENDERED_CATALOG_DIGEST) + runAfter: + - validate-fbc + taskRef: + params: + - name: name + value: fbc-target-index-pruning-check + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-fbc-target-index-pruning-check:0.1@sha256:016d0fa117dd2aa36420ebe74f938dda6cacb28d193d71775f6141dbab976cc6 + - name: kind + value: task + resolver: bundles + when: + - input: $(params.skip-checks) + operator: in + values: + - "false" - name: deprecated-base-image-check params: - name: IMAGE_URL From 526c4c1e16be72183c80a48cdeb2a7dba7050e29 Mon Sep 17 00:00:00 2001 From: Isaac Date: Fri, 6 Jun 2025 10:58:25 +0200 Subject: [PATCH 2/8] Add stub for new releases of FBC --- .../cli-manifests/staging-release-fbc.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 konflux-ci/cli-manifests/staging-release-fbc.yaml diff --git a/konflux-ci/cli-manifests/staging-release-fbc.yaml b/konflux-ci/cli-manifests/staging-release-fbc.yaml new file mode 100644 index 00000000..68ffb521 --- /dev/null +++ b/konflux-ci/cli-manifests/staging-release-fbc.yaml @@ -0,0 +1,19 @@ +# Applying this manifest will trigger a new release of the FBC. +# Temporary or automatic konflux snapshots may deliver a failed release +# To check the process and logs, connect to the UI and navigate to Application > Releases > [release-name] > PipelineRun +--- +apiVersion: appstudio.redhat.com/v1alpha1 +kind: Release +metadata: + name: staging-release-fbc-snapshot-0605-01 + namespace: dvo-obsint-tenant +spec: + releasePlan: release-plan-fbc-staging + snapshot: deployment-validation-operator-fbc-tqxc5 + data: + releaseNotes: + topic: Test FBC index Release + synopsis: Test to debug Release process + description: Test to debug Release process + solution: "" + references: [] From aa58295d95b03ee57d50e9da40e31dc63a23b236 Mon Sep 17 00:00:00 2001 From: Isaac Date: Fri, 6 Jun 2025 12:12:36 +0200 Subject: [PATCH 3/8] Add missing task dependency --- ...-validation-operator-fbc-pull-request.yaml | 22 +++++++++++++++++++ ...ployment-validation-operator-fbc-push.yaml | 22 +++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/.tekton/deployment-validation-operator-fbc-pull-request.yaml b/.tekton/deployment-validation-operator-fbc-pull-request.yaml index 3a97dd32..e892ed06 100644 --- a/.tekton/deployment-validation-operator-fbc-pull-request.yaml +++ b/.tekton/deployment-validation-operator-fbc-pull-request.yaml @@ -293,6 +293,28 @@ spec: operator: in values: - "false" + - name: validate-fbc + params: + - name: IMAGE_URL + value: $(tasks.build-image-index.results.IMAGE_URL) + - name: IMAGE_DIGEST + value: $(tasks.build-image-index.results.IMAGE_DIGEST) + runAfter: + - build-image-index + taskRef: + params: + - name: name + value: validate-fbc + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-validate-fbc:0.1@sha256:30a5df9773eb9cab3efd808206370761302d4dc59dc5aa14e56b571c7daf9ee9 + - name: kind + value: task + resolver: bundles + when: + - input: $(params.skip-checks) + operator: in + values: + - "false" - name: deprecated-base-image-check params: - name: IMAGE_URL diff --git a/.tekton/deployment-validation-operator-fbc-push.yaml b/.tekton/deployment-validation-operator-fbc-push.yaml index 631543c2..f2f69410 100644 --- a/.tekton/deployment-validation-operator-fbc-push.yaml +++ b/.tekton/deployment-validation-operator-fbc-push.yaml @@ -289,6 +289,28 @@ spec: operator: in values: - "false" + - name: validate-fbc + params: + - name: IMAGE_URL + value: $(tasks.build-image-index.results.IMAGE_URL) + - name: IMAGE_DIGEST + value: $(tasks.build-image-index.results.IMAGE_DIGEST) + runAfter: + - build-image-index + taskRef: + params: + - name: name + value: validate-fbc + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-validate-fbc:0.1@sha256:30a5df9773eb9cab3efd808206370761302d4dc59dc5aa14e56b571c7daf9ee9 + - name: kind + value: task + resolver: bundles + when: + - input: $(params.skip-checks) + operator: in + values: + - "false" - name: deprecated-base-image-check params: - name: IMAGE_URL From e428357881d96d3f3dc3538bbe311264bf49eca4 Mon Sep 17 00:00:00 2001 From: Isaac Date: Fri, 6 Jun 2025 16:46:48 +0200 Subject: [PATCH 4/8] Fix catalog with most recent image to serve as base --- konflux-ci/fbc/catalog/catalog.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/konflux-ci/fbc/catalog/catalog.yml b/konflux-ci/fbc/catalog/catalog.yml index 9d0740e1..559d4fc0 100644 --- a/konflux-ci/fbc/catalog/catalog.yml +++ b/konflux-ci/fbc/catalog/catalog.yml @@ -7,20 +7,20 @@ schema: olm.channel package: deployment-validation-operator name: alpha entries: -- name: deployment-validation-operator.v0.7.8 - skipRange: ">=0.0.1 <0.7.8" +- name: deployment-validation-operator.0.7.9 + skipRange: ">=0.0.1 <0.7.9" --- -image: quay.io/redhat-user-workloads/dvo-obsint-tenant/deployment-validation-operator-bundle:a4ef83cce9987fbd8f8391081791ea1ee7e310e2 -name: deployment-validation-operator.v0.7.8 +image: registry.redhat.io/dvo/deployment-validation-operator-bundle:0.7.9 +name: deployment-validation-operator.0.7.9 package: deployment-validation-operator properties: - type: olm.package value: packageName: deployment-validation-operator - version: 0.7.8 + version: 0.7.9 - type: olm.bundle.object value: - data: eyJhcGlWZXJzaW9uIjoib3BlcmF0b3JzLmNvcmVvcy5jb20vdjFhbHBoYTEiLCJraW5kIjoiQ2x1c3RlclNlcnZpY2VWZXJzaW9uIiwibWV0YWRhdGEiOnsiYW5ub3RhdGlvbnMiOnsiYWxtLWV4YW1wbGVzIjoiW10iLCJjYXBhYmlsaXRpZXMiOiJCYXNpYyBJbnN0YWxsIiwiY2F0ZWdvcmllcyI6IkFwcGxpY2F0aW9uIFJ1bnRpbWUsIE1vbml0b3JpbmcsIFNlY3VyaXR5IiwiY2VydGlmaWVkIjoiZmFsc2UiLCJjb250YWluZXJJbWFnZSI6InF1YXkuaW8vZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yL2R2LW9wZXJhdG9yOjAuNy44IiwiY3JlYXRlZEF0IjoiMjAyNC0xMS0yN1QwMDowMDowMFoiLCJkZXNjcmlwdGlvbiI6IlRoZSBkZXBsb3ltZW50IHZhbGlkYXRpb24gb3BlcmF0b3IiLCJpZ25vcmUtY2hlY2sua3ViZS1saW50ZXIuaW8vbWluaW11bS10aHJlZS1yZXBsaWNhcyI6IlRoaXMgZGVwbG95bWVudCB1c2VzIDEgcG9kIGFzIGN1cnJlbnRseSByZXBsaWNhdGluZyBkb2VzIG5vdCByZXBsaWNhdGUgbWV0cmljIGRhdGEgY2F1c2luZyBpbnN0YWxsYXRpb24gaXNzdWVzIiwib3BlcmF0b3JzLm9wZXJhdG9yZnJhbWV3b3JrLmlvL2J1aWxkZXIiOiJvcGVyYXRvci1zZGstdjEuMzEuMCtnaXQiLCJvcGVyYXRvcnMub3BlcmF0b3JmcmFtZXdvcmsuaW8vcHJvamVjdF9sYXlvdXQiOiJ1bmtub3duIiwicmVwb3NpdG9yeSI6Imh0dHBzOi8vZ2l0aHViLmNvbS9hcHAtc3JlL2RlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvciIsInN1cHBvcnQiOiJCZXN0IEVmZm9ydCJ9LCJuYW1lIjoiZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yLnYwLjcuOCJ9LCJzcGVjIjp7ImRlc2NyaXB0aW9uIjoiVGhlIERlcGxveW1lbnQgVmFsaWRhdGlvbiBPcGVyYXRvciAoRFZPKSBjaGVja3MgZGVwbG95bWVudHMgYW5kIG90aGVyIHJlc291cmNlcyBhZ2FpbnN0IGEgY3VyYXRlZCBjb2xsZWN0aW9uIG9mIGJlc3QgcHJhY3RpY2VzLlxuVGhlc2UgYmVzdCBwcmFjdGljZXMgZm9jdXMgbWFpbmx5IG9uIGVuc3VyaW5nIHRoYXQgdGhlIGFwcGxpY2F0aW9ucyBhcmUgZmF1bHQtdG9sZXJhbnQuIERWTyByZXBvcnRzIGZhaWxlZCB2YWxpZGF0aW9ucyB2aWEgUHJvbWV0aGV1cyBtZXRyaWNzLlxuSWYgdGhlIGJlc3QtcHJhY3RpY2UgY2hlY2sgaGFzIGZhaWxlZCwgdGhlIG1ldHJpY3Mgd2lsbCByZXBvcnQgYDFgLlxuIiwiZGlzcGxheU5hbWUiOiJEZXBsb3ltZW50IFZhbGlkYXRpb24gT3BlcmF0b3IiLCJpY29uIjpbeyJiYXNlNjRkYXRhIjoiUEhOMlp5QjRiV3h1Y3owaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzl6ZG1jaUlIWnBaWGRDYjNnOUlqQWdNQ0F5TlRndU5URWdNalU0TGpVeElqNDhaR1ZtY3o0OGMzUjViR1UrTG1Oc2N5MHhlMlpwYkd3NkkyUXhaREZrTVR0OUxtTnNjeTB5ZTJacGJHdzZJemhrT0dRNFpqdDlQQzl6ZEhsc1pUNDhMMlJsWm5NK1BIUnBkR3hsUGtGemMyVjBJRFE4TDNScGRHeGxQanhuSUdsa1BTSk1ZWGxsY2w4eUlpQmtZWFJoTFc1aGJXVTlJa3hoZVdWeUlESWlQanhuSUdsa1BTSk1ZWGxsY2w4eExUSWlJR1JoZEdFdGJtRnRaVDBpVEdGNVpYSWdNU0krUEhCaGRHZ2dZMnhoYzNNOUltTnNjeTB4SWlCa1BTSk5NVEk1TGpJMUxESXdRVEV3T1M0eExERXdPUzR4TERBc01Dd3hMREl3Tmk0MExESXdOaTQwTERFd09TNHhMREV3T1M0eExEQXNNU3d4TERVeUxqRXhMRFV5TGpFeExERXdPQzQwTlN3eE1EZ3VORFVzTUN3d0xERXNNVEk1TGpJMUxESXdiVEF0TWpCb01FTTFPQzR4Tml3d0xEQXNOVGd1TVRZc01Dd3hNamt1TWpWSU1HTXdMRGN4TGpBNUxEVTRMakUyTERFeU9TNHlOaXd4TWprdU1qVXNNVEk1TGpJMmFEQmpOekV1TURrc01Dd3hNamt1TWpZdE5UZ3VNVGNzTVRJNUxqSTJMVEV5T1M0eU5tZ3dRekkxT0M0MU1TdzFPQzR4Tml3eU1EQXVNelFzTUN3eE1qa3VNalVzTUZvaUx6NDhjR0YwYUNCamJHRnpjejBpWTJ4ekxUSWlJR1E5SWsweE56Y3VOVFFzTVRBekxqUXhTREUwTVM0Mk5rd3hOVFF1T1N3Mk5TNDNObU14TGpJMUxUUXVOQzB5TGpNekxUZ3VOell0Tnk0eU1TMDRMamMyU0RFd01pNDVNMkUzTGpNeUxEY3VNeklzTUN3d0xEQXROeTQwTERac0xURXdMRFk1TGpZeFl5MHVOVGtzTkM0eE55d3lMamc1TERjdU9Ea3NOeTQwTERjdU9EbG9Nell1T1V3eE1UVXVOVFVzTVRrM1l5MHhMakV5TERRdU5ERXNNaTQwT0N3NExqVTFMRGN1TWpRc09DNDFOV0UzTGpVNExEY3VOVGdzTUN3d0xEQXNOaTQwTnkwekxqUTRUREU0TkN3eE1UTXVPRFZETVRnMkxqZzJMREV3T1M0eU5Dd3hPRE11TWprc01UQXpMalF4TERFM055NDFOQ3d4TURNdU5ERmFJaTgrUEM5blBqd3ZaejQ4TDNOMlp6ND0iLCJtZWRpYXR5cGUiOiJpbWFnZS9zdmcreG1sIn1dLCJpbnN0YWxsIjp7InNwZWMiOnsiY2x1c3RlclBlcm1pc3Npb25zIjpbeyJydWxlcyI6W3siYXBpR3JvdXBzIjpbIioiXSwicmVzb3VyY2VzIjpbIioiXSwidmVyYnMiOlsiZ2V0IiwibGlzdCIsIndhdGNoIl19XSwic2VydmljZUFjY291bnROYW1lIjoiZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yIn1dLCJkZXBsb3ltZW50cyI6W3sibGFiZWwiOnsiYXBwIjoiZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yIn0sIm5hbWUiOiJkZXBsb3ltZW50LXZhbGlkYXRpb24tb3BlcmF0b3IiLCJzcGVjIjp7InJlcGxpY2FzIjoxLCJzZWxlY3RvciI6eyJtYXRjaExhYmVscyI6eyJhcHAiOiJkZXBsb3ltZW50LXZhbGlkYXRpb24tb3BlcmF0b3IifX0sInN0cmF0ZWd5Ijp7InJvbGxpbmdVcGRhdGUiOnsibWF4U3VyZ2UiOjEsIm1heFVuYXZhaWxhYmxlIjowfSwidHlwZSI6IlJvbGxpbmdVcGRhdGUifSwidGVtcGxhdGUiOnsibWV0YWRhdGEiOnsibGFiZWxzIjp7ImFwcCI6ImRlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvciIsIm5hbWUiOiJkZXBsb3ltZW50LXZhbGlkYXRpb24tb3BlcmF0b3IifX0sInNwZWMiOnsiYWZmaW5pdHkiOnsicG9kQW50aUFmZmluaXR5Ijp7InByZWZlcnJlZER1cmluZ1NjaGVkdWxpbmdJZ25vcmVkRHVyaW5nRXhlY3V0aW9uIjpbeyJwb2RBZmZpbml0eVRlcm0iOnsibGFiZWxTZWxlY3RvciI6eyJtYXRjaEV4cHJlc3Npb25zIjpbeyJrZXkiOiJhcHAiLCJvcGVyYXRvciI6IkluIiwidmFsdWVzIjpbImRlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvciJdfV19LCJ0b3BvbG9neUtleSI6Imt1YmVybmV0ZXMuaW8vaG9zdG5hbWUifSwid2VpZ2h0IjoxMDB9XX19LCJjb250YWluZXJzIjpbeyJhcmdzIjpbIi0tY29uZmlnIC9jb25maWcvZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yLWNvbmZpZy55YW1sIl0sImVudiI6W3sibmFtZSI6IldBVENIX05BTUVTUEFDRSIsInZhbHVlRnJvbSI6eyJmaWVsZFJlZiI6eyJmaWVsZFBhdGgiOiJtZXRhZGF0YS5hbm5vdGF0aW9uc1snb2xtLnRhcmdldE5hbWVzcGFjZXMnXSJ9fX0seyJuYW1lIjoiT1BFUkFUT1JfTkFNRSIsInZhbHVlIjoiZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yIn0seyJuYW1lIjoiTkFNRVNQQUNFX0lHTk9SRV9QQVRURVJOIiwidmFsdWUiOiJeKG9wZW5zaGlmdC4qfGt1YmUtLip8b3Blbi1jbHVzdGVyLW1hbmFnZW1lbnQtLip8ZGVmYXVsdHxkZWRpY2F0ZWQtYWRtaW58cmVkaGF0LS4qfGFjbXxhZGRvbi1kYmEtb3BlcmF0b3J8Y29kZXJlYWR5LS4qfHByb3cpJCJ9LHsibmFtZSI6IlJFU09VUkNFU19QRVJfTElTVF9RVUVSWSIsInZhbHVlIjoiNSJ9LHsibmFtZSI6IlZBTElEQVRJT05fQ0hFQ0tfSU5URVJWQUwiLCJ2YWx1ZSI6IjJtIn0seyJuYW1lIjoiUE9EX05BTUUiLCJ2YWx1ZUZyb20iOnsiZmllbGRSZWYiOnsiZmllbGRQYXRoIjoibWV0YWRhdGEubmFtZSJ9fX0seyJuYW1lIjoiUE9EX05BTUVTUEFDRSIsInZhbHVlRnJvbSI6eyJmaWVsZFJlZiI6eyJmaWVsZFBhdGgiOiJtZXRhZGF0YS5uYW1lc3BhY2UifX19XSwiaW1hZ2UiOiJxdWF5LmlvL2RlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvci9kdi1vcGVyYXRvcjowLjcuOCIsImltYWdlUHVsbFBvbGljeSI6IkFsd2F5cyIsIm5hbWUiOiJkZXBsb3ltZW50LXZhbGlkYXRpb24tb3BlcmF0b3IiLCJwb3J0cyI6W3siY29udGFpbmVyUG9ydCI6ODM4MywibmFtZSI6Imh0dHAtbWV0cmljcyIsInByb3RvY29sIjoiVENQIn1dLCJyZXNvdXJjZXMiOnsibGltaXRzIjp7Im1lbW9yeSI6IjQwME1pIn0sInJlcXVlc3RzIjp7ImNwdSI6IjUwbSIsIm1lbW9yeSI6IjIwME1pIn19LCJzZWN1cml0eUNvbnRleHQiOnsicmVhZE9ubHlSb290RmlsZXN5c3RlbSI6dHJ1ZX0sInZvbHVtZU1vdW50cyI6W3sibW91bnRQYXRoIjoiL2NvbmZpZyIsIm5hbWUiOiJkdm8tY29uZmlnIn1dfV0sInJlc3RhcnRQb2xpY3kiOiJBbHdheXMiLCJzZXJ2aWNlQWNjb3VudE5hbWUiOiJkZXBsb3ltZW50LXZhbGlkYXRpb24tb3BlcmF0b3IiLCJ0ZXJtaW5hdGlvbkdyYWNlUGVyaW9kU2Vjb25kcyI6MzAsInZvbHVtZXMiOlt7ImNvbmZpZ01hcCI6eyJuYW1lIjoiZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yLWNvbmZpZyIsIm9wdGlvbmFsIjp0cnVlfSwibmFtZSI6ImR2by1jb25maWcifV19fX19XSwicGVybWlzc2lvbnMiOlt7InJ1bGVzIjpbeyJhcGlHcm91cHMiOlsiIl0sInJlc291cmNlcyI6WyJjb25maWdtYXBzIiwic2VydmljZXMiXSwidmVyYnMiOlsiZ2V0IiwiY3JlYXRlIiwibGlzdCIsImRlbGV0ZSIsInVwZGF0ZSIsIndhdGNoIiwicGF0Y2giXX0seyJhcGlHcm91cHMiOlsibW9uaXRvcmluZy5jb3Jlb3MuY29tIl0sInJlc291cmNlcyI6WyJzZXJ2aWNlbW9uaXRvcnMiXSwidmVyYnMiOlsiKiJdfV0sInNlcnZpY2VBY2NvdW50TmFtZSI6ImRlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvciJ9XX0sInN0cmF0ZWd5IjoiZGVwbG95bWVudCJ9LCJpbnN0YWxsTW9kZXMiOlt7InN1cHBvcnRlZCI6dHJ1ZSwidHlwZSI6Ik93bk5hbWVzcGFjZSJ9LHsic3VwcG9ydGVkIjp0cnVlLCJ0eXBlIjoiU2luZ2xlTmFtZXNwYWNlIn0seyJzdXBwb3J0ZWQiOnRydWUsInR5cGUiOiJBbGxOYW1lc3BhY2VzIn0seyJzdXBwb3J0ZWQiOmZhbHNlLCJ0eXBlIjoiTXVsdGlOYW1lc3BhY2UifV0sImtleXdvcmRzIjpbImR2byJdLCJsYWJlbHMiOnsiYWxtLW93bmVyLWR2byI6ImRlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvciIsIm9wZXJhdGVkLWJ5IjoiZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yIn0sImxpbmtzIjpbeyJuYW1lIjoicmVwb3NpdG9yeSIsInVybCI6Imh0dHBzOi8vZ2l0aHViLmNvbS9hcHAtc3JlL2RlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvciJ9LHsibmFtZSI6ImNvbnRhaW5lckltYWdlIiwidXJsIjoiaHR0cHM6Ly9xdWF5LmlvL2RlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvci9kdi1vcGVyYXRvcjowLjcuOCJ9XSwibWFpbnRhaW5lcnMiOlt7ImVtYWlsIjoiZHZvLW93bmVyc0ByZWRoYXQuY29tIiwibmFtZSI6IlJlZCBIYXQifV0sIm1hdHVyaXR5IjoiYWxwaGEiLCJwcm92aWRlciI6eyJuYW1lIjoiUmVkIEhhdCJ9LCJyZXBsYWNlcyI6ImRlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvci52MC43LjciLCJzZWxlY3RvciI6eyJtYXRjaExhYmVscyI6eyJhbG0tb3duZXItZHZvIjoiZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yIiwib3BlcmF0ZWQtYnkiOiJkZXBsb3ltZW50LXZhbGlkYXRpb24tb3BlcmF0b3IifX0sInNraXBSYW5nZSI6Ilx1MDAzZT0wLjAuMTAgXHUwMDNjMC43LjgiLCJ2ZXJzaW9uIjoiMC43LjgifX0= + data: {"apiVersion":"operators.coreos.com/v1alpha1","kind":"ClusterServiceVersion","metadata":{"annotations":{"alm-examples":"[]","capabilities":"Basic Install","createdAt":"2023-09-12T14:13:09Z","features.operators.openshift.io/cnf":"false","features.operators.openshift.io/cni":"false","features.operators.openshift.io/csi":"false","features.operators.openshift.io/disconnected":"true","features.operators.openshift.io/fips-compliant":"false","features.operators.openshift.io/proxy-aware":"false","features.operators.openshift.io/tls-profiles":"false","features.operators.openshift.io/token-auth-aws":"false","features.operators.openshift.io/token-auth-azure":"false","features.operators.openshift.io/token-auth-gcp":"false","olm.skipRange":"\u003e=0.7.9 \u003c0.7.9","operators.operatorframework.io/builder":"operator-sdk-v1.31.0+git","operators.operatorframework.io/project_layout":"unknown"},"name":"deployment-validation-operator.0.7.9","namespace":"placeholder"},"spec":{"apiservicedefinitions":{},"customresourcedefinitions":{},"description":"The Deployment Validation Operator (DVO) checks deployments and other resources against a curated collection of best practices. These best practices focus mainly on ensuring that the applications are fault-tolerant. DVO reports failed validations via Prometheus metrics. If the best-practice check has failed, the metrics will report `1`.","displayName":"Deployment Validation Operator","icon":[{"base64data":"PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTguNTEgMjU4LjUxIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2QxZDFkMTt9LmNscy0ye2ZpbGw6IzhkOGQ4Zjt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkFzc2V0IDQ8L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTI5LjI1LDIwQTEwOS4xLDEwOS4xLDAsMCwxLDIwNi40LDIwNi40LDEwOS4xLDEwOS4xLDAsMSwxLDUyLjExLDUyLjExLDEwOC40NSwxMDguNDUsMCwwLDEsMTI5LjI1LDIwbTAtMjBoMEM1OC4xNiwwLDAsNTguMTYsMCwxMjkuMjVIMGMwLDcxLjA5LDU4LjE2LDEyOS4yNiwxMjkuMjUsMTI5LjI2aDBjNzEuMDksMCwxMjkuMjYtNTguMTcsMTI5LjI2LTEyOS4yNmgwQzI1OC41MSw1OC4xNiwyMDAuMzQsMCwxMjkuMjUsMFoiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNzcuNTQsMTAzLjQxSDE0MS42NkwxNTQuOSw2NS43NmMxLjI1LTQuNC0yLjMzLTguNzYtNy4yMS04Ljc2SDEwMi45M2E3LjMyLDcuMzIsMCwwLDAtNy40LDZsLTEwLDY5LjYxYy0uNTksNC4xNywyLjg5LDcuODksNy40LDcuODloMzYuOUwxMTUuNTUsMTk3Yy0xLjEyLDQuNDEsMi40OCw4LjU1LDcuMjQsOC41NWE3LjU4LDcuNTgsMCwwLDAsNi40Ny0zLjQ4TDE4NCwxMTMuODVDMTg2Ljg2LDEwOS4yNCwxODMuMjksMTAzLjQxLDE3Ny41NCwxMDMuNDFaIi8+PC9nPjwvZz48L3N2Zz4=","mediatype":"image/svg+xml"}],"install":{"spec":{"clusterPermissions":[{"rules":[{"apiGroups":["*"],"resources":["*"],"verbs":["get","list","watch"]}],"serviceAccountName":"deployment-validation-operator"}],"deployments":[{"label":{"app":"deployment-validation-operator"},"name":"deployment-validation-operator","spec":{"replicas":1,"selector":{"matchLabels":{"app":"deployment-validation-operator"}},"strategy":{"rollingUpdate":{"maxSurge":1,"maxUnavailable":0},"type":"RollingUpdate"},"template":{"metadata":{"labels":{"app":"deployment-validation-operator","name":"deployment-validation-operator"}},"spec":{"affinity":{"podAntiAffinity":{"preferredDuringSchedulingIgnoredDuringExecution":[{"podAffinityTerm":{"labelSelector":{"matchExpressions":[{"key":"app","operator":"In","values":["deployment-validation-operator"]}]},"topologyKey":"kubernetes.io/hostname"},"weight":100}]}},"containers":[{"args":["--config=/config/deployment-validation-operator-config.yaml"],"env":[{"name":"WATCH_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.annotations['olm.targetNamespaces']"}}},{"name":"OPERATOR_NAME","value":"deployment-validation-operator"},{"name":"NAMESPACE_IGNORE_PATTERN","value":"openshift.*|kube-.+|open-cluster-management-.*|default|dedicated-admin"},{"name":"RESOURCES_PER_LIST_QUERY","value":"5"},{"name":"VALIDATION_CHECK_INTERVAL","value":"2m"},{"name":"POD_NAME","valueFrom":{"fieldRef":{"fieldPath":"metadata.name"}}},{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}}],"image":"registry.redhat.io/dvo/deployment-validation-rhel8-operator@sha256:b0d2ef07aa74edee606dbde0a56c88164a8dcfa89bbb5751d53c39d076e434ad","imagePullPolicy":"Always","livenessProbe":{"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":30,"periodSeconds":10,"timeoutSeconds":3},"name":"deployment-validation-operator","readinessProbe":{"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10,"timeoutSeconds":3},"resources":{"limits":{"memory":"400Mi"},"requests":{"cpu":"50m","memory":"200Mi"}},"securityContext":{"readOnlyRootFilesystem":true},"volumeMounts":[{"mountPath":"/config","name":"dvo-config"}]}],"restartPolicy":"Always","serviceAccountName":"deployment-validation-operator","terminationGracePeriodSeconds":30,"volumes":[{"configMap":{"name":"deployment-validation-operator-config","optional":true},"name":"dvo-config"}]}}}}],"permissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps","services"],"verbs":["get","create","list","delete","update","watch","patch"]},{"apiGroups":["monitoring.coreos.com"],"resources":["servicemonitors"],"verbs":["*"]}],"serviceAccountName":"deployment-validation-operator"}]},"strategy":"deployment"},"installModes":[{"supported":true,"type":"OwnNamespace"},{"supported":true,"type":"SingleNamespace"},{"supported":false,"type":"MultiNamespace"},{"supported":true,"type":"AllNamespaces"}],"keywords":["deployment-validation-operator"],"links":[{"name":"repository","url":"https://github.com/app-sre/deployment-validation-operator"},{"name":"documentation","url":"https://access.redhat.com/documentation/en-us/red_hat_insights_for_openshift/1-latest/html/monitoring_your_openshift_cluster_health_with_insights_advisor/using-insights-to-identify-issues-with-your-cluster#dvo-on-premesis-openshift_deployment-validation-operator"}],"maintainers":[{"email":"dvo-owners@redhat.com","name":"Red Hat"}],"maturity":"alpha","provider":{"name":"Red Hat","url":""},"relatedImages":[{"image":"registry.redhat.io/dvo/deployment-validation-rhel8-operator@sha256:b0d2ef07aa74edee606dbde0a56c88164a8dcfa89bbb5751d53c39d076e434ad","name":"deployment-validation-operator"}],"replaces":"deployment-validation-operator.0.7.5","version":"0.7.9"}} - type: olm.bundle.object value: data: eyJhcGlWZXJzaW9uIjoidjEiLCJkYXRhIjp7ImRlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvci1jb25maWcueWFtbCI6ImNoZWNrczpcbiAgZG9Ob3RBdXRvQWRkRGVmYXVsdHM6IHRydWVcbiAgYWRkQWxsQnVpbHRJbjogZmFsc2VcbiAgaW5jbHVkZTpcbiAgLSBcImhvc3QtaXBjXCJcbiAgLSBcImhvc3QtbmV0d29ya1wiXG4gIC0gXCJob3N0LXBpZFwiXG4gIC0gXCJub24taXNvbGF0ZWQtcG9kXCJcbiAgLSBcInBkYi1tYXgtdW5hdmFpbGFibGVcIlxuICAtIFwicGRiLW1pbi1hdmFpbGFibGVcIlxuICAtIFwicHJpdmlsZWdlLWVzY2FsYXRpb24tY29udGFpbmVyXCJcbiAgLSBcInByaXZpbGVnZWQtY29udGFpbmVyXCJcbiAgLSBcInJ1bi1hcy1ub24tcm9vdFwiXG4gIC0gXCJ1bnNhZmUtc3lzY3Rsc1wiXG4gIC0gXCJ1bnNldC1jcHUtcmVxdWlyZW1lbnRzXCJcbiAgLSBcInVuc2V0LW1lbW9yeS1yZXF1aXJlbWVudHNcIiJ9LCJraW5kIjoiQ29uZmlnTWFwIiwibWV0YWRhdGEiOnsibGFiZWxzIjp7Im5hbWUiOiJkZXBsb3ltZW50LXZhbGlkYXRpb24tb3BlcmF0b3IifSwibmFtZSI6ImRlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvci1jb25maWcifX0= @@ -28,8 +28,8 @@ properties: value: data: eyJhcGlWZXJzaW9uIjoidjEiLCJraW5kIjoiU2VydmljZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJsYWJlbHMiOnsibmFtZSI6ImRlcGxveW1lbnQtdmFsaWRhdGlvbi1vcGVyYXRvciJ9LCJuYW1lIjoiZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yLW1ldHJpY3MifSwic3BlYyI6eyJwb3J0cyI6W3sibmFtZSI6Imh0dHAtbWV0cmljcyIsInBvcnQiOjgzODMsInByb3RvY29sIjoiVENQIiwidGFyZ2V0UG9ydCI6ODM4M31dLCJzZWxlY3RvciI6eyJuYW1lIjoiZGVwbG95bWVudC12YWxpZGF0aW9uLW9wZXJhdG9yIn19LCJzdGF0dXMiOnsibG9hZEJhbGFuY2VyIjp7fX19 relatedImages: -- image: quay.io/deployment-validation-operator/dv-operator:0.7.8 - name: "" -- image: quay.io/redhat-user-workloads/dvo-obsint-tenant/deployment-validation-operator-bundle:a4ef83cce9987fbd8f8391081791ea1ee7e310e2 +- image: registry.redhat.io/dvo/deployment-validation-operator-bundle:0.7.9 name: "" +- image: registry.redhat.io/dvo/deployment-validation-rhel8-operator@sha256:b0d2ef07aa74edee606dbde0a56c88164a8dcfa89bbb5751d53c39d076e434ad + name: deployment-validation-operator schema: olm.bundle From 63d9ff3d22e1752171da72ee03834a90b44e4548 Mon Sep 17 00:00:00 2001 From: Isaac Date: Wed, 11 Jun 2025 16:53:47 +0200 Subject: [PATCH 5/8] Update CRD version --- .tekton/images-mirror-set.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.tekton/images-mirror-set.yaml b/.tekton/images-mirror-set.yaml index 30bfb0be..d5dfe759 100644 --- a/.tekton/images-mirror-set.yaml +++ b/.tekton/images-mirror-set.yaml @@ -1,5 +1,5 @@ --- -apiVersion: operator.openshift.io/v1alpha1 +apiVersion: operator.openshift.io/v1 kind: ImageDigestMirrorSet metadata: name: staging-mirror-set @@ -9,7 +9,7 @@ spec: - quay.io/redhat-user-workloads/dvo-obsint-tenant/deployment-validation-operator/deployment-validation-operator@sha256:cb4a68ebedba10bbd504fb271b3b7cc52d01ed13557dcb9604059f1ba98717d1 source: registry.stage.redhat.io/dvo/deployment-validation-rhel8-operator --- -apiVersion: operator.openshift.io/v1alpha1 +apiVersion: operator.openshift.io/v1 kind: ImageDigestMirrorSet metadata: name: prod-mirror-set From bbeec30436c5c6fae1e98d8962949598615b7905 Mon Sep 17 00:00:00 2001 From: Isaac Date: Wed, 11 Jun 2025 17:11:47 +0200 Subject: [PATCH 6/8] Update apiVersion --- .tekton/images-mirror-set.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.tekton/images-mirror-set.yaml b/.tekton/images-mirror-set.yaml index d5dfe759..fa16e794 100644 --- a/.tekton/images-mirror-set.yaml +++ b/.tekton/images-mirror-set.yaml @@ -1,5 +1,5 @@ --- -apiVersion: operator.openshift.io/v1 +apiVersion: config.openshift.io/v1 kind: ImageDigestMirrorSet metadata: name: staging-mirror-set @@ -9,7 +9,7 @@ spec: - quay.io/redhat-user-workloads/dvo-obsint-tenant/deployment-validation-operator/deployment-validation-operator@sha256:cb4a68ebedba10bbd504fb271b3b7cc52d01ed13557dcb9604059f1ba98717d1 source: registry.stage.redhat.io/dvo/deployment-validation-rhel8-operator --- -apiVersion: operator.openshift.io/v1 +apiVersion: config.openshift.io/v1 kind: ImageDigestMirrorSet metadata: name: prod-mirror-set From 58e03ec1933d688d85925492ce3d3b7ca7df793e Mon Sep 17 00:00:00 2001 From: Isaac Date: Wed, 11 Jun 2025 17:29:47 +0200 Subject: [PATCH 7/8] Cleanup unsupported tasks --- ...-validation-operator-fbc-pull-request.yaml | 72 ------------------- 1 file changed, 72 deletions(-) diff --git a/.tekton/deployment-validation-operator-fbc-pull-request.yaml b/.tekton/deployment-validation-operator-fbc-pull-request.yaml index e892ed06..b6551414 100644 --- a/.tekton/deployment-validation-operator-fbc-pull-request.yaml +++ b/.tekton/deployment-validation-operator-fbc-pull-request.yaml @@ -352,78 +352,6 @@ spec: - name: kind value: task resolver: bundles - - name: inspect-image - params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - - name: IMAGE_DIGEST - value: $(tasks.build-image-index.results.IMAGE_DIGEST) - runAfter: - - build-image-index - taskRef: - params: - - name: name - value: inspect-image - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-inspect-image:0.2@sha256:15daf7ac637b1bcda8ddf88314d7c4a4dfa391a19ca1ef54b10cadad97bdb173 - - name: kind - value: task - resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" - workspaces: - - name: source - workspace: workspace - - name: fbc-validate - params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - - name: IMAGE_DIGEST - value: $(tasks.build-image-index.results.IMAGE_DIGEST) - - name: BASE_IMAGE - value: $(tasks.inspect-image.results.BASE_IMAGE) - runAfter: - - inspect-image - taskRef: - params: - - name: name - value: fbc-validation - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-fbc-validation:0.2@sha256:9726c7703db3645f322f9a175acb45a7f05cf44ec03a49af4429dcb328a12bb9 - - name: kind - value: task - resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" - workspaces: - - name: workspace - workspace: workspace - - name: fbc-related-image-check - runAfter: - - fbc-validate - taskRef: - params: - - name: name - value: fbc-related-image-check - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-fbc-related-image-check:0.2@sha256:9f8de647264cd08a2c8517e6882067f527b89b586230995082093b90755ac34d - - name: kind - value: task - resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" - workspaces: - - name: workspace - workspace: workspace workspaces: - name: workspace - name: git-auth From aae961bc00cfad5124e6748f62825a6e5cf25333 Mon Sep 17 00:00:00 2001 From: Isaac Date: Thu, 12 Jun 2025 18:39:37 +0200 Subject: [PATCH 8/8] Merge changes from master branch referring to FBC pipelines and catalog --- ...-validation-operator-fbc-pull-request.yaml | 230 +++++++++-------- ...ployment-validation-operator-fbc-push.yaml | 242 +++++++----------- konflux-ci/fbc/catalog.Dockerfile | 4 +- 3 files changed, 228 insertions(+), 248 deletions(-) diff --git a/.tekton/deployment-validation-operator-fbc-pull-request.yaml b/.tekton/deployment-validation-operator-fbc-pull-request.yaml index b6551414..73396be4 100644 --- a/.tekton/deployment-validation-operator-fbc-pull-request.yaml +++ b/.tekton/deployment-validation-operator-fbc-pull-request.yaml @@ -6,6 +6,7 @@ metadata: build.appstudio.redhat.com/commit_sha: '{{revision}}' build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' build.appstudio.redhat.com/target_branch: '{{target_branch}}' + pipelinesascode.tekton.dev/cancel-in-progress: "true" pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "master" && ( "konflux-ci/fbc/***".pathChanged() || ".tekton/deployment-validation-operator-fbc-pull-request.yaml".pathChanged() @@ -27,13 +28,16 @@ spec: value: quay.io/redhat-user-workloads/dvo-obsint-tenant/deployment-validation-operator-fbc:on-pr-{{revision}} - name: image-expires-after value: 5d + - name: build-platforms + value: + - linux/x86_64 - name: dockerfile value: konflux-ci/fbc/catalog.Dockerfile - name: path-context value: konflux-ci/fbc pipelineSpec: description: | - This pipeline is ideal for building and verifying [file-based catalogs](https://konflux-ci.dev/docs/advanced-how-tos/building-olm.adoc#building-the-file-based-catalog). + This pipeline is ideal for building and verifying [file-based catalogs](https://konflux-ci.dev/docs/end-to-end/building-olm/#building-the-file-based-catalog). _Uses `buildah` to create a container image. Its build-time tests are limited to verifying the included catalog and do not scan the image. This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-fbc-builder?tab=tags)_ @@ -51,28 +55,6 @@ 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-image-index.status) - taskRef: - params: - - name: name - value: summary - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:76075b709fa06ed824cbc84f41448b397b85bfde1cf9809395ba6d286f5b7cbd - - name: kind - value: task - resolver: bundles - workspaces: - - name: workspace - workspace: workspace params: - description: Source Repository URL name: git-url @@ -118,10 +100,24 @@ spec: description: Build a source image. name: build-source-image type: string - - default: "false" + - default: "true" description: Add built image into an OCI image index name: build-image-index type: string + - default: [] + description: Array of --build-arg values ("arg=value" strings) for buildah + name: build-args + type: array + - default: "" + description: Path to a file with build arguments for buildah, see https://www.mankier.com/1/buildah-build#--build-arg-file + name: build-args-file + type: string + - default: + - linux/x86_64 + description: List of platforms to build the container images on. The available + set of values is determined by the configuration of the multi-platform-controller. + name: build-platforms + type: array results: - description: "" name: IMAGE_URL @@ -159,14 +155,18 @@ 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 + value: git-clone-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:3ced9a6b9d8520773d3ffbf062190515a362ecda11e72f56e38e4dd980294b57 + value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0fea1e4bd2fdde46c5b7786629f423a51e357f681c32ceddd744a6e3d48b8327 - name: kind value: task resolver: bundles @@ -176,11 +176,40 @@ spec: values: - "true" workspaces: - - name: output - workspace: workspace - name: basic-auth workspace: git-auth - - name: build-container + - 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 + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:adbd819c6b727ac0c5519475d174dcad64cfa8df6ee50acd58f7fb562c59d4f7 + - name: kind + value: task + resolver: bundles + workspaces: + - name: git-basic-auth + workspace: git-auth + - name: netrc + workspace: netrc + - matrix: + params: + - name: PLATFORM + value: + - $(params.build-platforms) + name: build-images params: - name: IMAGE value: $(params.output-image) @@ -190,18 +219,31 @@ spec: value: $(params.path-context) - name: HERMETIC value: $(params.hermetic) + - name: PREFETCH_INPUT + value: $(params.prefetch-input) - name: IMAGE_EXPIRES_AFTER value: $(params.image-expires-after) - name: COMMIT_SHA value: $(tasks.clone-repository.results.commit) + - name: BUILD_ARGS + value: + - $(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) + - name: IMAGE_APPEND_PLATFORM + value: "true" runAfter: - clone-repository taskRef: params: - name: name - value: buildah + value: buildah-remote-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.4@sha256:2b2f5ebb9289853ab178d266b72f8c9c47c5e37f0935515b2a68f7487fbce28d + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:cfeeef2f4ab25b121afdf44eecc394ed67f3534a1bd14bef9e7beef2ee654b8e - name: kind value: task resolver: bundles @@ -210,9 +252,6 @@ spec: operator: in values: - "true" - workspaces: - - name: source - workspace: workspace - name: build-image-index params: - name: IMAGE @@ -225,15 +264,15 @@ spec: value: $(params.build-image-index) - name: IMAGES value: - - $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST) + - $(tasks.build-images.results.IMAGE_REF[*]) runAfter: - - build-container + - build-images taskRef: params: - name: name value: build-image-index - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:08abb8b12d69b8a33d5ce465304934c6f78e6850613c1c91eb6bf7e1c27d8319 + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:9c95b1fe17db091ae364344ba2006af46648e08486eef1f6fe1b9e3f10866875 - name: kind value: task resolver: bundles @@ -242,20 +281,20 @@ spec: operator: in values: - "true" - - name: fbc-fips-check + - name: deprecated-base-image-check params: - - name: image-digest - value: $(tasks.build-image-index.results.IMAGE_DIGEST) - - name: image-url + - name: IMAGE_URL value: $(tasks.build-image-index.results.IMAGE_URL) + - name: IMAGE_DIGEST + value: $(tasks.build-image-index.results.IMAGE_DIGEST) runAfter: - build-image-index taskRef: params: - name: name - value: fbc-fips-check + value: deprecated-image-check - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check:0.1@sha256:b9765593ff80990a4cc73c8502e9548ac06c9d60d7fc6150dbdee90867ae2306 + value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:ecd33669676b3a193ff4c2c6223cb912cc1b0cf5cc36e080eaec7718500272cf - name: kind value: task resolver: bundles @@ -264,71 +303,61 @@ spec: operator: in values: - "false" - workspaces: - - name: workspace - workspace: workspace - - name: fbc-target-index-pruning-check + - name: apply-tags params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - - name: IMAGE_DIGEST - value: $(tasks.build-image-index.results.IMAGE_DIGEST) - - name: TARGET_INDEX - value: registry.redhat.io/redhat/redhat-operator-index - - name: RENDERED_CATALOG_DIGEST - value: $(tasks.validate-fbc.results.RENDERED_CATALOG_DIGEST) + - name: IMAGE + value: $(tasks.build-image-index.results.IMAGE_URL) runAfter: - - validate-fbc + - build-image-index taskRef: params: - - name: name - value: fbc-target-index-pruning-check - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-fbc-target-index-pruning-check:0.1@sha256:016d0fa117dd2aa36420ebe74f938dda6cacb28d193d71775f6141dbab976cc6 - - name: kind - value: task + - name: name + value: apply-tags + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:1c6f673fe100a49f58aaef62580c8adf0c397790964f4e7bac7fcd3f4d07c92e + - name: kind + value: task resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" - name: validate-fbc params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - - name: IMAGE_DIGEST - value: $(tasks.build-image-index.results.IMAGE_DIGEST) + - name: IMAGE_URL + value: $(tasks.build-image-index.results.IMAGE_URL) + - name: IMAGE_DIGEST + value: $(tasks.build-image-index.results.IMAGE_DIGEST) runAfter: - - build-image-index + - build-image-index taskRef: params: - - name: name - value: validate-fbc - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-validate-fbc:0.1@sha256:30a5df9773eb9cab3efd808206370761302d4dc59dc5aa14e56b571c7daf9ee9 - - name: kind - value: task + - name: name + value: validate-fbc + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-validate-fbc:0.1@sha256:30a5df9773eb9cab3efd808206370761302d4dc59dc5aa14e56b571c7daf9ee9 + - name: kind + value: task resolver: bundles when: - - input: $(params.skip-checks) - operator: in - values: - - "false" - - name: deprecated-base-image-check + - input: $(params.skip-checks) + operator: in + values: + - "false" + - name: fbc-target-index-pruning-check params: - name: IMAGE_URL value: $(tasks.build-image-index.results.IMAGE_URL) - name: IMAGE_DIGEST value: $(tasks.build-image-index.results.IMAGE_DIGEST) + - name: TARGET_INDEX + value: registry.redhat.io/redhat/redhat-operator-index + - name: RENDERED_CATALOG_DIGEST + value: $(tasks.validate-fbc.results.RENDERED_CATALOG_DIGEST) runAfter: - - build-image-index + - validate-fbc taskRef: params: - name: name - value: deprecated-image-check + value: fbc-target-index-pruning-check - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:ecd33669676b3a193ff4c2c6223cb912cc1b0cf5cc36e080eaec7718500272cf + value: quay.io/konflux-ci/tekton-catalog/task-fbc-target-index-pruning-check:0.1@sha256:016d0fa117dd2aa36420ebe74f938dda6cacb28d193d71775f6141dbab976cc6 - name: kind value: task resolver: bundles @@ -337,23 +366,31 @@ spec: operator: in values: - "false" - - name: apply-tags + - name: fbc-fips-check-oci-ta params: - - name: IMAGE + - name: image-digest + value: $(tasks.build-image-index.results.IMAGE_DIGEST) + - name: image-url value: $(tasks.build-image-index.results.IMAGE_URL) + - name: SOURCE_ARTIFACT + value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) runAfter: - build-image-index taskRef: params: - name: name - value: apply-tags + value: fbc-fips-check-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:1c6f673fe100a49f58aaef62580c8adf0c397790964f4e7bac7fcd3f4d07c92e + value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:479d93d8ff93e8e40025608fda6fc5049a556c88272e8391ddab39d95d04e307 - name: kind value: task resolver: bundles + when: + - input: $(params.skip-checks) + operator: in + values: + - "false" workspaces: - - name: workspace - name: git-auth optional: true - name: netrc @@ -361,17 +398,6 @@ spec: taskRunTemplate: serviceAccountName: build-pipeline-deployment-validation-operator-fbc workspaces: - - name: workspace - volumeClaimTemplate: - metadata: - creationTimestamp: null - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi - status: {} - name: git-auth secret: secretName: '{{ git_auth_secret }}' diff --git a/.tekton/deployment-validation-operator-fbc-push.yaml b/.tekton/deployment-validation-operator-fbc-push.yaml index f2f69410..bb926043 100644 --- a/.tekton/deployment-validation-operator-fbc-push.yaml +++ b/.tekton/deployment-validation-operator-fbc-push.yaml @@ -5,6 +5,7 @@ metadata: build.appstudio.openshift.io/repo: https://github.com/app-sre/deployment-validation-operator?rev={{revision}} build.appstudio.redhat.com/commit_sha: '{{revision}}' build.appstudio.redhat.com/target_branch: '{{target_branch}}' + pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "master" @@ -23,13 +24,16 @@ spec: value: '{{revision}}' - name: output-image value: quay.io/redhat-user-workloads/dvo-obsint-tenant/deployment-validation-operator-fbc:{{revision}} + - name: build-platforms + value: + - linux/x86_64 - name: dockerfile value: konflux-ci/fbc/catalog.Dockerfile - name: path-context value: konflux-ci/fbc pipelineSpec: description: | - This pipeline is ideal for building and verifying [file-based catalogs](https://konflux-ci.dev/docs/advanced-how-tos/building-olm.adoc#building-the-file-based-catalog). + This pipeline is ideal for building and verifying [file-based catalogs](https://konflux-ci.dev/docs/end-to-end/building-olm/#building-the-file-based-catalog). _Uses `buildah` to create a container image. Its build-time tests are limited to verifying the included catalog and do not scan the image. This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-fbc-builder?tab=tags)_ @@ -47,28 +51,6 @@ 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-image-index.status) - taskRef: - params: - - name: name - value: summary - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:76075b709fa06ed824cbc84f41448b397b85bfde1cf9809395ba6d286f5b7cbd - - name: kind - value: task - resolver: bundles - workspaces: - - name: workspace - workspace: workspace params: - description: Source Repository URL name: git-url @@ -114,10 +96,24 @@ spec: description: Build a source image. name: build-source-image type: string - - default: "false" + - default: "true" description: Add built image into an OCI image index name: build-image-index type: string + - default: [] + description: Array of --build-arg values ("arg=value" strings) for buildah + name: build-args + type: array + - default: "" + description: Path to a file with build arguments for buildah, see https://www.mankier.com/1/buildah-build#--build-arg-file + name: build-args-file + type: string + - default: + - linux/x86_64 + description: List of platforms to build the container images on. The available + set of values is determined by the configuration of the multi-platform-controller. + name: build-platforms + type: array results: - description: "" name: IMAGE_URL @@ -155,14 +151,18 @@ 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 + value: git-clone-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:3ced9a6b9d8520773d3ffbf062190515a362ecda11e72f56e38e4dd980294b57 + value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0fea1e4bd2fdde46c5b7786629f423a51e357f681c32ceddd744a6e3d48b8327 - name: kind value: task resolver: bundles @@ -172,11 +172,40 @@ spec: values: - "true" workspaces: - - name: output - workspace: workspace - name: basic-auth workspace: git-auth - - name: build-container + - 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 + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:adbd819c6b727ac0c5519475d174dcad64cfa8df6ee50acd58f7fb562c59d4f7 + - name: kind + value: task + resolver: bundles + workspaces: + - name: git-basic-auth + workspace: git-auth + - name: netrc + workspace: netrc + - matrix: + params: + - name: PLATFORM + value: + - $(params.build-platforms) + name: build-images params: - name: IMAGE value: $(params.output-image) @@ -186,18 +215,31 @@ spec: value: $(params.path-context) - name: HERMETIC value: $(params.hermetic) + - name: PREFETCH_INPUT + value: $(params.prefetch-input) - name: IMAGE_EXPIRES_AFTER value: $(params.image-expires-after) - name: COMMIT_SHA value: $(tasks.clone-repository.results.commit) + - name: BUILD_ARGS + value: + - $(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) + - name: IMAGE_APPEND_PLATFORM + value: "true" runAfter: - clone-repository taskRef: params: - name: name - value: buildah + value: buildah-remote-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.4@sha256:2b2f5ebb9289853ab178d266b72f8c9c47c5e37f0935515b2a68f7487fbce28d + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:cfeeef2f4ab25b121afdf44eecc394ed67f3534a1bd14bef9e7beef2ee654b8e - name: kind value: task resolver: bundles @@ -206,9 +248,6 @@ spec: operator: in values: - "true" - workspaces: - - name: source - workspace: workspace - name: build-image-index params: - name: IMAGE @@ -221,15 +260,15 @@ spec: value: $(params.build-image-index) - name: IMAGES value: - - $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST) + - $(tasks.build-images.results.IMAGE_REF[*]) runAfter: - - build-container + - build-images taskRef: params: - name: name value: build-image-index - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:08abb8b12d69b8a33d5ce465304934c6f78e6850613c1c91eb6bf7e1c27d8319 + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:9c95b1fe17db091ae364344ba2006af46648e08486eef1f6fe1b9e3f10866875 - name: kind value: task resolver: bundles @@ -238,79 +277,6 @@ spec: operator: in values: - "true" - - name: fbc-fips-check - params: - - name: image-digest - value: $(tasks.build-image-index.results.IMAGE_DIGEST) - - name: image-url - value: $(tasks.build-image-index.results.IMAGE_URL) - runAfter: - - build-image-index - taskRef: - params: - - name: name - value: fbc-fips-check - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check:0.1@sha256:b9765593ff80990a4cc73c8502e9548ac06c9d60d7fc6150dbdee90867ae2306 - - name: kind - value: task - resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" - workspaces: - - name: workspace - workspace: workspace - - name: fbc-target-index-pruning-check - params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - - name: IMAGE_DIGEST - value: $(tasks.build-image-index.results.IMAGE_DIGEST) - - name: TARGET_INDEX - value: registry.redhat.io/redhat/redhat-operator-index - - name: RENDERED_CATALOG_DIGEST - value: $(tasks.validate-fbc.results.RENDERED_CATALOG_DIGEST) - runAfter: - - validate-fbc - taskRef: - params: - - name: name - value: fbc-target-index-pruning-check - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-fbc-target-index-pruning-check:0.1@sha256:016d0fa117dd2aa36420ebe74f938dda6cacb28d193d71775f6141dbab976cc6 - - name: kind - value: task - resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" - - name: validate-fbc - params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - - name: IMAGE_DIGEST - value: $(tasks.build-image-index.results.IMAGE_DIGEST) - runAfter: - - build-image-index - taskRef: - params: - - name: name - value: validate-fbc - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-validate-fbc:0.1@sha256:30a5df9773eb9cab3efd808206370761302d4dc59dc5aa14e56b571c7daf9ee9 - - name: kind - value: task - resolver: bundles - when: - - input: $(params.skip-checks) - operator: in - values: - - "false" - name: deprecated-base-image-check params: - name: IMAGE_URL @@ -348,7 +314,7 @@ spec: - name: kind value: task resolver: bundles - - name: inspect-image + - name: validate-fbc params: - name: IMAGE_URL value: $(tasks.build-image-index.results.IMAGE_URL) @@ -359,9 +325,9 @@ spec: taskRef: params: - name: name - value: inspect-image + value: validate-fbc - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-inspect-image:0.2@sha256:15daf7ac637b1bcda8ddf88314d7c4a4dfa391a19ca1ef54b10cadad97bdb173 + value: quay.io/konflux-ci/tekton-catalog/task-validate-fbc:0.1@sha256:30a5df9773eb9cab3efd808206370761302d4dc59dc5aa14e56b571c7daf9ee9 - name: kind value: task resolver: bundles @@ -370,25 +336,24 @@ spec: operator: in values: - "false" - workspaces: - - name: source - workspace: workspace - - name: fbc-validate + - name: fbc-target-index-pruning-check params: - name: IMAGE_URL value: $(tasks.build-image-index.results.IMAGE_URL) - name: IMAGE_DIGEST value: $(tasks.build-image-index.results.IMAGE_DIGEST) - - name: BASE_IMAGE - value: $(tasks.inspect-image.results.BASE_IMAGE) + - name: TARGET_INDEX + value: registry.redhat.io/redhat/redhat-operator-index + - name: RENDERED_CATALOG_DIGEST + value: $(tasks.validate-fbc.results.RENDERED_CATALOG_DIGEST) runAfter: - - inspect-image + - validate-fbc taskRef: params: - name: name - value: fbc-validation + value: fbc-target-index-pruning-check - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-fbc-validation:0.2@sha256:9726c7703db3645f322f9a175acb45a7f05cf44ec03a49af4429dcb328a12bb9 + value: quay.io/konflux-ci/tekton-catalog/task-fbc-target-index-pruning-check:0.1@sha256:016d0fa117dd2aa36420ebe74f938dda6cacb28d193d71775f6141dbab976cc6 - name: kind value: task resolver: bundles @@ -397,18 +362,22 @@ spec: operator: in values: - "false" - workspaces: - - name: workspace - workspace: workspace - - name: fbc-related-image-check + - name: fbc-fips-check-oci-ta + params: + - name: image-digest + value: $(tasks.build-image-index.results.IMAGE_DIGEST) + - name: image-url + value: $(tasks.build-image-index.results.IMAGE_URL) + - name: SOURCE_ARTIFACT + value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) runAfter: - - fbc-validate + - build-image-index taskRef: params: - name: name - value: fbc-related-image-check + value: fbc-fips-check-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-fbc-related-image-check:0.2@sha256:9f8de647264cd08a2c8517e6882067f527b89b586230995082093b90755ac34d + value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:479d93d8ff93e8e40025608fda6fc5049a556c88272e8391ddab39d95d04e307 - name: kind value: task resolver: bundles @@ -417,11 +386,7 @@ spec: operator: in values: - "false" - workspaces: - - name: workspace - workspace: workspace workspaces: - - name: workspace - name: git-auth optional: true - name: netrc @@ -429,17 +394,6 @@ spec: taskRunTemplate: serviceAccountName: build-pipeline-deployment-validation-operator-fbc workspaces: - - name: workspace - volumeClaimTemplate: - metadata: - creationTimestamp: null - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi - status: {} - name: git-auth secret: secretName: '{{ git_auth_secret }}' diff --git a/konflux-ci/fbc/catalog.Dockerfile b/konflux-ci/fbc/catalog.Dockerfile index 0e24d7dd..fa48f14c 100644 --- a/konflux-ci/fbc/catalog.Dockerfile +++ b/konflux-ci/fbc/catalog.Dockerfile @@ -1,12 +1,12 @@ # The builder image is expected to contain # /bin/opm (with serve subcommand) -FROM quay.io/operator-framework/opm:latest as builder +FROM registry.redhat.io/openshift4/ose-operator-registry as builder # Copy FBC root into image at /configs and pre-populate serve cache ADD catalog /configs RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"] -FROM quay.io/operator-framework/opm:latest +FROM registry.redhat.io/openshift4/ose-operator-registry # The base image is expected to contain # /bin/opm (with serve subcommand) and /bin/grpc_health_probe