-
Notifications
You must be signed in to change notification settings - Fork 146
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(STONEINTG-1078): Combine all FBC validation tasks into one #1534
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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: 2025-01-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 | ||
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: 2025-01-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 | ||
``` |
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,30 @@ | ||
# fbc-validation task | ||
|
||
## Description: | ||
Ensures file-based catalog (FBC) components are uniquely linted for proper construction as part of build pipeline. | ||
|
||
For further information on how to use the task, see the USAGE.md file. | ||
|
||
For troubleshooting assistance, see the TROUBLESHOOTING.md file. | ||
|
||
## Params: | ||
|
||
| name | description | | ||
|--------------|----------------------------------| | ||
| IMAGE_DIGEST | Image digest. | | ||
| IMAGE_URL | Fully qualified image name. | | ||
| BASE_IMAGE | Fully qualified base image name. | | ||
|
||
## Results: | ||
|
||
| name | description | | ||
|--------------------|---------------------------| | ||
| TEST_OUTPUT | Tekton task test output. | | ||
|
||
## Source repository for image: | ||
https://github.com/konflux-ci/konflux-test | ||
|
||
## Additional links: | ||
https://olm.operatorframework.io/docs/reference/file-based-catalogs/ | ||
https://github.com/containers/skopeo | ||
https://docs.openshift.com/container-platform/4.12/cli_reference/opm/cli-opm-install.html |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will it be possible to announce this also on users channel for general awareness?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we would need to announce these changes.