Skip to content

ROX-27831: set image expiration based on event type and target branch #14192

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
tommartensen merged 10 commits into from
Feb 17, 2025
Merged

ROX-27831: set image expiration based on event type and target branch #14192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5bbd74c
add custom task and use it to determine the image expiration without …
tommartensen Feb 10, 2025
c957efd
update task definition
tommartensen Feb 10, 2025
2aafbd8
fix
tommartensen Feb 10, 2025
285c266
update text
tommartensen Feb 10, 2025
528bb2a
ensure logic works
tommartensen Feb 10, 2025
310c686
use task bundle and update all pipeline definitions
tommartensen Feb 11, 2025
4e62bcf
update remaining pipeline
tommartensen Feb 11, 2025
6fa77e2
fix runAfter of operator-bundle pipeline
tommartensen Feb 11, 2025
8da2900
update task digest and name
tommartensen Feb 13, 2025
5ee054e
update task digest and name
tommartensen Feb 13, 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
26 changes: 20 additions & 6 deletions .tekton/basic-component-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,20 @@ spec:
value: task
resolver: bundles

- name: determine-image-expiration
params:
- name: DEFAULT_IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
taskRef:
params:
- name: name
value: determine-image-expiration
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:e557f9ca3e3d31f48127c3528c2c2647f4b49e2d72dce022c85fbe121c113ecd
- name: kind
value: task
resolver: bundles

- name: clone-repository
params:
- name: url
Expand Down Expand Up @@ -227,7 +241,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -264,7 +278,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -303,7 +317,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -342,7 +356,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -381,7 +395,7 @@ spec:
- $(tasks.build-container-ppc64le.results.IMAGE_REF)
- $(tasks.build-container-arm64.results.IMAGE_REF)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
taskRef:
params:
- name: name
Expand Down Expand Up @@ -409,7 +423,7 @@ spec:
- $(tasks.build-container-ppc64le.results.IMAGE_REF)
- $(tasks.build-container-arm64.results.IMAGE_REF)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
taskRef:
params:
- name: name
Expand Down
26 changes: 20 additions & 6 deletions .tekton/main-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,20 @@ spec:
value: task
resolver: bundles

- name: determine-image-expiration
params:
- name: DEFAULT_IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
taskRef:
params:
- name: name
value: determine-image-expiration
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:e557f9ca3e3d31f48127c3528c2c2647f4b49e2d72dce022c85fbe121c113ecd
- name: kind
value: task
resolver: bundles

- name: clone-repository
params:
- name: url
Expand Down Expand Up @@ -247,7 +261,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -288,7 +302,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -330,7 +344,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -372,7 +386,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -412,7 +426,7 @@ spec:
- $(tasks.build-container-ppc64le.results.IMAGE_REF)
- $(tasks.build-container-arm64.results.IMAGE_REF)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
taskRef:
params:
- name: name
Expand Down Expand Up @@ -440,7 +454,7 @@ spec:
- $(tasks.build-container-ppc64le.results.IMAGE_REF)
- $(tasks.build-container-arm64.results.IMAGE_REF)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
taskRef:
params:
- name: name
Expand Down
17 changes: 16 additions & 1 deletion .tekton/operator-bundle-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,20 @@ spec:
value: task
resolver: bundles

- name: determine-image-expiration
params:
- name: DEFAULT_IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
taskRef:
params:
- name: name
value: determine-image-expiration
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:e557f9ca3e3d31f48127c3528c2c2647f4b49e2d72dce022c85fbe121c113ecd
- name: kind
value: task
resolver: bundles

- name: clone-repository
params:
- name: url
Expand Down Expand Up @@ -426,7 +440,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -643,6 +657,7 @@ spec:
- clamav-scan
- clone-repository
- deprecated-base-image-check
- determine-image-expiration
- determine-image-tag
- init
- prefetch-dependencies
Expand Down
26 changes: 20 additions & 6 deletions .tekton/scanner-v4-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,20 @@ spec:
value: task
resolver: bundles

- name: determine-image-expiration
params:
- name: DEFAULT_IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
taskRef:
params:
- name: name
value: determine-image-expiration
- name: bundle
value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:e557f9ca3e3d31f48127c3528c2c2647f4b49e2d72dce022c85fbe121c113ecd
- name: kind
value: task
resolver: bundles

- name: clone-repository
params:
- name: url
Expand Down Expand Up @@ -247,7 +261,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -284,7 +298,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -323,7 +337,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -362,7 +376,7 @@ spec:
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS
Expand Down Expand Up @@ -401,7 +415,7 @@ spec:
- $(tasks.build-container-ppc64le.results.IMAGE_REF)
- $(tasks.build-container-arm64.results.IMAGE_REF)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
taskRef:
params:
- name: name
Expand Down Expand Up @@ -429,7 +443,7 @@ spec:
- $(tasks.build-container-ppc64le.results.IMAGE_REF)
- $(tasks.build-container-arm64.results.IMAGE_REF)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
taskRef:
params:
- name: name
Expand Down
Loading