Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Combine all FBC validation tasks into one
This change combines the inspect-image, fbc-validate, and fbc-related-image-check into a single task. It depends on functionality that needs to be added to EC to parse the produced trusted artifact in order to assess whether the related images are valid. All of the old tasks will be deprecated and the required tasks need to be updated to require only ``` - [fbc-related-image-check, validate-fbc] ``` This will ensure that users can still be guaranteed to have a valid FBC fragment and appropriate related images. Signed-off-by: arewm <[email protected]>
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - fbc-related-image-check.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| ## Deprecation notice | ||
|
|
||
| This task is deprecated, please remove it from your pipeline. | ||
| Deprecation date: 2024-12-31 | ||
|
|
||
| # Migration from 0.1 to 0.2 | ||
|
|
||
| Version 0.2: | ||
|
|
||
| No changes within this version, its only purpose is to provide information on how to remove this task from your pipeline. | ||
|
|
||
| ## Action from users | ||
|
|
||
| To remove this task from your pipeline please follow these steps: | ||
|
|
||
| 1. Remove the fbc-related-image-check task definition from your FBC pipelines similar to this change: | ||
|
|
||
| ```diff | ||
| --- a/.tekton/original-pipelinerun.yaml | ||
| +++ b/.tekton/new-pipelinerun.yaml | ||
| @@ -323,26 +323,6 @@ spec: | ||
| 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.1@sha256:0fae84cc832d21c250334ab1d285db92e7e22e916ea342d044e46136c502d2f8 | ||
| - - 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 | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # fbc-related-image-check task | ||
|
|
||
| ## Description: | ||
| The fbc-related-image-check task checks whether all images referenced in file-based catalog (FBC) are valid by using | ||
| Skopeo to inspect manifest content. | ||
|
|
||
| ## Results: | ||
|
|
||
| | name | description | | ||
| |-------------------|---------------------------| | ||
| | TEST_OUTPUT | Tekton task test output. | | ||
|
|
||
| ## Source repository for image: | ||
| https://github.com/konflux-ci/konflux-test | ||
|
|
||
| ## Additional links: | ||
| https://www.redhat.com/en/topics/containers/what-is-skopeo | ||
| https://olm.operatorframework.io/docs/reference/file-based-catalogs/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
|
Check failure on line 1 in task/fbc-related-image-check/0.2/kustomization.yaml
|
||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../0.1 | ||
|
|
||
| patches: | ||
| - patch: |- | ||
| - op: replace | ||
| path: /metadata/labels | ||
| value: | ||
| app.kubernetes.io/version: "0.2" | ||
| target: | ||
| kind: Task | ||
| name: fbc-related-image-check | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - fbc-validation.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| ## Deprecation notice | ||
|
|
||
| This task is deprecated, please remove it from your pipeline and replace it with the new validate-fbc task. | ||
| Deprecation date: 2024-12-31 | ||
|
|
||
| # Migration from 0.1 to 0.2 | ||
|
|
||
| Version 0.2: | ||
|
|
||
| No changes within this version, its only purpose is to provide information on how to remove this task from your pipeline. | ||
|
|
||
| ## Action from users | ||
|
|
||
| To remove this task from your pipeline please follow these steps: | ||
|
|
||
| 1. Remove the fbc-validation task definition from your FBC pipelines similar to this change: | ||
|
|
||
| ```diff | ||
| --- a/.tekton/original-pipelinerun.yaml | ||
| +++ b/.tekton/new-pipelinerun.yaml | ||
| @@ -323,26 +323,6 @@ spec: | ||
| workspaces: | ||
| - name: workspace | ||
| workspace: workspace | ||
| - - name: fbc-validation | ||
| + - name: validate-fbc | ||
| - runAfter: | ||
| - - inspect-image | ||
| + - build-image-index | ||
| taskRef: | ||
| params: | ||
| - name: name | ||
| - value: fbc-validation | ||
| + value: validate-fbc | ||
| - - name: bundle | ||
| - value: quay.io/konflux-ci/tekton-catalog/task-validate-fbc:0.1 | ||
| - 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 | ||
| ``` |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
|
Check failure on line 1 in task/fbc-validation/0.2/kustomization.yaml
|
||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../0.1 | ||
|
|
||
| patches: | ||
| - patch: |- | ||
| - op: replace | ||
| path: /metadata/labels | ||
| value: | ||
| app.kubernetes.io/version: "0.2" | ||
| target: | ||
| kind: Task | ||
| name: fbc-validation | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Oops, something went wrong.