Skip to content

Commit 911da79

Browse files
committed
feat(RELEASE-2092): get snapshot from kubearchive if deleted
The catalog tasks mostly use the get-resource script in release-utils-repo to get Kubernetes resources. For snapshots, this script has been modified to fallback to kubearchive if the resource had been deleted [1]. This approach doesn't work if the get-resource script isn't used to get the snapshot. This commit modifies the one instance where this happens to use the get-resource script, ensuring that the kubearchive fallback is used. [1] konflux-ci/release-service-utils#657 Assisted-by: Cursor Signed-off-by: Lubomir Gallovic <lgallovi@redhat.com>
1 parent 5252a39 commit 911da79

18 files changed

+54
-50
lines changed

tasks/managed/collect-data/collect-data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ spec:
148148
runAsUser: 1001
149149
steps:
150150
- name: collect-data
151-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
151+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
152152
computeResources:
153153
limits:
154154
memory: 64Mi

tasks/managed/collect-data/tests/test-collect-data-fail-disallowed-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
env:
4242
steps:
4343
- name: setup
44-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
44+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
4545
script: |
4646
#!/usr/bin/env bash
4747
set -eux
@@ -164,7 +164,7 @@ spec:
164164
taskSpec:
165165
steps:
166166
- name: delete-crs
167-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
167+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
168168
script: |
169169
#!/usr/bin/env sh
170170
set -eux

tasks/managed/collect-data/tests/test-collect-data-fail-disallowed-releaseplan.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
env:
4242
steps:
4343
- name: setup
44-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
44+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
4545
script: |
4646
#!/usr/bin/env bash
4747
set -eux
@@ -164,7 +164,7 @@ spec:
164164
taskSpec:
165165
steps:
166166
- name: delete-crs
167-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
167+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
168168
script: |
169169
#!/usr/bin/env sh
170170
set -eux

tasks/managed/collect-data/tests/test-collect-data-fail-missing-cr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
env:
3232
steps:
3333
- name: create-crs
34-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
34+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
3535
script: |
3636
#!/usr/bin/env bash
3737
set -eux
@@ -116,7 +116,7 @@ spec:
116116
taskSpec:
117117
steps:
118118
- name: delete-crs
119-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
119+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
120120
script: |
121121
#!/usr/bin/env sh
122122
set -eux

tasks/managed/collect-data/tests/test-collect-data-fail-missing-rsc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
env:
3232
steps:
3333
- name: create-crs
34-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
34+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
3535
script: |
3636
#!/usr/bin/env bash
3737
set -eux
@@ -106,7 +106,7 @@ spec:
106106
taskSpec:
107107
steps:
108108
- name: delete-crs
109-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
109+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
110110
script: |
111111
#!/usr/bin/env sh
112112
set -eux

tasks/managed/collect-data/tests/test-collect-data-print-pipeline-ref-nongit.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
value: "$(params.trustedArtifactsDebug)"
4747
steps:
4848
- name: create-crs
49-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
49+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
5050
script: |
5151
#!/usr/bin/env bash
5252
set -eux
@@ -207,7 +207,7 @@ spec:
207207
- name: sourceDataArtifact
208208
value: $(params.sourceDataArtifact)
209209
- name: check-result
210-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
210+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
211211
env:
212212
- name: PIPELINE_METADATA
213213
value: '$(params.releasePipelineMetadata)'
@@ -240,7 +240,7 @@ spec:
240240
taskSpec:
241241
steps:
242242
- name: delete-crs
243-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
243+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
244244
script: |
245245
#!/usr/bin/env sh
246246
set -eux

tasks/managed/collect-data/tests/test-collect-data-print-pipeline-ref.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
value: "$(params.trustedArtifactsDebug)"
4646
steps:
4747
- name: create-crs
48-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
48+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
4949
script: |
5050
#!/usr/bin/env bash
5151
set -eux
@@ -202,7 +202,7 @@ spec:
202202
- name: sourceDataArtifact
203203
value: $(params.sourceDataArtifact)
204204
- name: check-result
205-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
205+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
206206
env:
207207
- name: PIPELINE_METADATA
208208
value: '$(params.releasePipelineMetadata)'
@@ -233,7 +233,7 @@ spec:
233233
taskSpec:
234234
steps:
235235
- name: delete-crs
236-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
236+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
237237
script: |
238238
#!/usr/bin/env sh
239239
set -eux

tasks/managed/collect-data/tests/test-collect-data-tags.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
value: "$(params.trustedArtifactsDebug)"
4646
steps:
4747
- name: create-crs
48-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
48+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
4949
script: |
5050
#!/usr/bin/env bash
5151
set -eux
@@ -250,7 +250,7 @@ spec:
250250
- name: sourceDataArtifact
251251
value: $(params.sourceDataArtifact)
252252
- name: check-result
253-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
253+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
254254
script: |
255255
#!/usr/bin/env bash
256256
set -eux
@@ -264,7 +264,7 @@ spec:
264264
taskSpec:
265265
steps:
266266
- name: delete-crs
267-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
267+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
268268
script: |
269269
#!/usr/bin/env sh
270270
set -eux

tasks/managed/collect-data/tests/test-collect-data-with-data-and-collectors.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
value: "$(params.trustedArtifactsDebug)"
4646
steps:
4747
- name: create-crs
48-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
48+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
4949
script: |
5050
#!/usr/bin/env bash
5151
set -eux
@@ -221,7 +221,7 @@ spec:
221221
- name: sourceDataArtifact
222222
value: $(params.sourceDataArtifact)
223223
- name: check-result
224-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
224+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
225225
script: |
226226
#!/usr/bin/env bash
227227
set -eux
@@ -242,7 +242,7 @@ spec:
242242
taskSpec:
243243
steps:
244244
- name: delete-crs
245-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
245+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
246246
script: |
247247
#!/usr/bin/env sh
248248
set -eux

tasks/managed/collect-data/tests/test-collect-data-with-data-and-no-collectors.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
value: "$(params.trustedArtifactsDebug)"
4646
steps:
4747
- name: create-crs
48-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
48+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
4949
script: |
5050
#!/usr/bin/env bash
5151
set -eux
@@ -213,7 +213,7 @@ spec:
213213
- name: sourceDataArtifact
214214
value: $(params.sourceDataArtifact)
215215
- name: check-result
216-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
216+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
217217
script: |
218218
#!/usr/bin/env bash
219219
set -eux
@@ -232,7 +232,7 @@ spec:
232232
taskSpec:
233233
steps:
234234
- name: delete-crs
235-
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
235+
image: quay.io/konflux-ci/release-service-utils@sha256:48af95ad820774a40d58f57c836f5cdc09f8e70b4d46da304e413e536da752e9
236236
script: |
237237
#!/usr/bin/env sh
238238
set -eux

0 commit comments

Comments
 (0)