Skip to content

Use Konflux built image refs for tekton task & cli image #2607

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.

Sign up for GitHub

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

Merged
simonbaird merged 2 commits into from
Jul 1, 2025
Merged

Use Konflux built image refs for tekton task & cli image #2607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5a3f59
Use newer tekton task ref in tenant release
simonbaird Jun 26, 2025
d3a7bd4
Use Konflux built image in task definitions
simonbaird Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tekton/cli-main-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
- name: output-image
value: quay.io/redhat-user-workloads/rhtap-contract-tenant/ec-main/cli-main:{{revision}}
- name: bundle-cli-ref-repo
value: quay.io/enterprise-contract/cli
value: quay.io/conforma/cli
- name: dockerfile
value: Dockerfile.dist
- name: image-expires-after
Expand Down
4 changes: 2 additions & 2 deletions release/cli.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ spec:
taskRef:
params:
- name: bundle
value: quay.io/enterprise-contract/ec-task-bundle:snapshot
value: quay.io/conforma/tekton-task:latest
- name: kind
value: task
- name: name
Expand All @@ -139,7 +139,7 @@ spec:
taskRef:
params:
- name: bundle
value: quay.io/enterprise-contract/ec-task-bundle:snapshot
value: quay.io/conforma/tekton-task:latest
- name: kind
value: task
- name: name
Expand Down
8 changes: 6 additions & 2 deletions release/setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ metadata:
name: tenant-release
namespace: rhtap-contract-tenant
secrets:
- name: ec-cli-main # push quay.io/enterprise-contract/cli
- name: ec-tekton-task-main # push quay.io/enterprise-contract/tekton-task
# Push credential for quay.io/conforma/cli
# and quay.io/enterprise-contract/cli
- name: ec-cli-main
# Push credential for quay.io/conforma/tekton-task
# and quay.io/enterprise-contract/tekton-task
- name: ec-tekton-task-main
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down
18 changes: 9 additions & 9 deletions tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
image: quay.io/redhat-appstudio/build-trusted-artifacts:e02102ede09aa07187cba066ad547a54724e5cf4

- name: initialize-tuf
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest

Check failure on line 204 in tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

View workflow job for this annotation

GitHub Actions / Lint 

Invalid image: 'quay.io/conforma/cli:latest'. Specify the image tag instead of using ':latest'
script: |-
set -euo pipefail

Expand Down Expand Up @@ -229,12 +229,12 @@
value: $(params.SINGLE_COMPONENT_CUSTOM_RESOURCE_NS)
- name: SNAPSHOT_PATH
value: $(params.HOMEDIR)/snapshot.json
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest

Check failure on line 232 in tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

View workflow job for this annotation

GitHub Actions / Lint 

Invalid image: 'quay.io/conforma/cli:latest'. Specify the image tag instead of using ':latest'
onError: continue # progress even if the step fails so we can see the debug logs
command: [reduce-snapshot.sh]

- name: validate
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest

Check failure on line 237 in tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

View workflow job for this annotation

GitHub Actions / Lint 

Invalid image: 'quay.io/conforma/cli:latest'. Specify the image tag instead of using ':latest'
onError: continue # progress even if the step fails so we can see the debug logs
command: [ec]
args:
Expand Down Expand Up @@ -297,7 +297,7 @@
readOnly: true

- name: report-json
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest

Check failure on line 300 in tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

View workflow job for this annotation

GitHub Actions / Lint 

Invalid image: 'quay.io/conforma/cli:latest'. Specify the image tag instead of using ':latest'
onError: continue # progress even if the step fails so we can see the debug logs
command: [sh, -c]
args:
Expand All @@ -310,34 +310,34 @@
- "jq . $(params.HOMEDIR)/report-json.json | awk '{gsub(/^ +/, \"\"); acc += length; if (acc >= 8000) { printf \"\\n\"; acc=length } printf $0 }'"

- name: summary
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest

Check failure on line 313 in tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

View workflow job for this annotation

GitHub Actions / Lint 

Invalid image: 'quay.io/conforma/cli:latest'. Specify the image tag instead of using ':latest'
onError: continue # progress even if the step fails so we can see the debug logs
command: [jq]
args:
- "."
- "$(results.TEST_OUTPUT.path)"

- name: info
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest

Check failure on line 321 in tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

View workflow job for this annotation

GitHub Actions / Lint 

Invalid image: 'quay.io/conforma/cli:latest'. Specify the image tag instead of using ':latest'
command: [printf]
args:
- "----- DEBUG OUTPUT -----\n"

- name: version
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest

Check failure on line 327 in tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

View workflow job for this annotation

GitHub Actions / Lint 

Invalid image: 'quay.io/conforma/cli:latest'. Specify the image tag instead of using ':latest'
command: [ec]
args:
- version

- name: show-config
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest

Check failure on line 333 in tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

View workflow job for this annotation

GitHub Actions / Lint 

Invalid image: 'quay.io/conforma/cli:latest'. Specify the image tag instead of using ':latest'
command: [jq]
args:
- '{policy: .policy, key: .key, "effective-time": .["effective-time"]}'
- "$(params.HOMEDIR)/report-json.json"

- name: assert
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest

Check failure on line 340 in tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

View workflow job for this annotation

GitHub Actions / Lint 

Invalid image: 'quay.io/conforma/cli:latest'. Specify the image tag instead of using ':latest'
command: [jq]
args:
- "--argjson"
Expand Down
18 changes: 9 additions & 9 deletions tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
memory: 256Mi
limits:
memory: 256Mi
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest

Check failure on line 182 in tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml

View workflow job for this annotation

GitHub Actions / Lint 

Invalid image: 'quay.io/conforma/cli:latest'. Specify the image tag instead of using ':latest'
command: [ec]
args:
- sigstore
Expand Down Expand Up @@ -211,12 +211,12 @@
value: $(params.SINGLE_COMPONENT_CUSTOM_RESOURCE_NS)
- name: SNAPSHOT_PATH
value: $(params.HOMEDIR)/snapshot.json
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest
onError: continue # progress even if the step fails so we can see the debug logs
command: [reduce-snapshot.sh]

- name: validate
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest
onError: continue # progress even if the step fails so we can see the debug logs
command: [ec]
args:
Expand Down Expand Up @@ -284,7 +284,7 @@
memory: 256Mi
limits:
memory: 256Mi
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest
onError: continue # progress even if the step fails so we can see the debug logs
command: [sh, -c]
args:
Expand All @@ -303,7 +303,7 @@
memory: 256Mi
limits:
memory: 256Mi
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest
onError: continue # progress even if the step fails so we can see the debug logs
command: [jq]
args:
Expand All @@ -317,7 +317,7 @@
memory: 256Mi
limits:
memory: 256Mi
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest
command: [printf]
args:
- "----- DEBUG OUTPUT -----\n"
Expand All @@ -329,7 +329,7 @@
memory: 256Mi
limits:
memory: 256Mi
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest
command: [ec]
args:
- version
Expand All @@ -341,7 +341,7 @@
memory: 256Mi
limits:
memory: 256Mi
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest
command: [jq]
args:
- '{policy: .policy, key: .key, "effective-time": .["effective-time"]}'
Expand All @@ -354,7 +354,7 @@
memory: 256Mi
limits:
memory: 256Mi
image: quay.io/conforma/cli:snapshot
image: quay.io/conforma/cli:latest
command: [jq]
args:
- "--argjson"
Expand Down
Loading