Skip to content

Commit d3a8602

Browse files
Pradnya-Chikhalerakshithakamath94
Pradnya-Chikhale
authored and
rakshithakamath94
committed
keepalived: updating task values
1 parent 5491116 commit d3a8602

File tree

2 files changed

+41
-20
lines changed

2 files changed

+41
-20
lines changed

‎.tekton/keepalived-9-0-pull-request.yaml‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ spec:
8787
description: Execute the build with network isolation
8888
name: hermetic
8989
type: string
90-
- default: '[{"type": "rpm", "path": "."}]'
90+
- default: '{"type": "rpm", "path": "."}'
9191
description: Build dependencies to be prefetched by Cachi2
9292
name: prefetch-input
9393
type: string
@@ -120,6 +120,10 @@ spec:
120120
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
121121
name: build-platforms
122122
type: array
123+
- name: buildah-format
124+
default: docker
125+
type: string
126+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
123127
results:
124128
- description: ""
125129
name: IMAGE_URL
@@ -147,7 +151,7 @@ spec:
147151
- name: name
148152
value: init
149153
- name: bundle
150-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
154+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
151155
- name: kind
152156
value: task
153157
resolver: bundles
@@ -197,7 +201,7 @@ spec:
197201
- name: name
198202
value: prefetch-dependencies-oci-ta
199203
- name: bundle
200-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:098322d6b789824f716f2d9caca1862d4afdc083ebaaee61aadd22a8c179480a
204+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
201205
- name: kind
202206
value: task
203207
resolver: bundles
@@ -240,14 +244,16 @@ spec:
240244
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
241245
- name: IMAGE_APPEND_PLATFORM
242246
value: "true"
247+
- name: BUILDAH_FORMAT
248+
value: $(params.buildah-format)
243249
runAfter:
244250
- prefetch-dependencies
245251
taskRef:
246252
params:
247253
- name: name
248254
value: buildah-remote-oci-ta
249255
- name: bundle
250-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:17a0b093c9e9d21e9e374c60a88eb293a0fa57e4e2b67baf20ccac9735aa20ff
256+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:650b0bca57c626c1e82f35cdfadf44a7792230b2b992aaa9c369d615aae6590d
251257
- name: kind
252258
value: task
253259
resolver: bundles
@@ -269,14 +275,16 @@ spec:
269275
- name: IMAGES
270276
value:
271277
- $(tasks.build-images.results.IMAGE_REF[*])
278+
- name: BUILDAH_FORMAT
279+
value: $(params.buildah-format)
272280
runAfter:
273281
- build-images
274282
taskRef:
275283
params:
276284
- name: name
277285
value: build-image-index
278286
- name: bundle
279-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:8e5dfb2fac011148f8715bbe0b99415f88297683d269eae0dfcad52562195d45
287+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
280288
- name: kind
281289
value: task
282290
resolver: bundles
@@ -288,7 +296,7 @@ spec:
288296
- name: build-source-image
289297
params:
290298
- name: BINARY_IMAGE
291-
value: $(tasks.build-image-index.results.IMAGE_URL)
299+
value: $(tasks.build-image-index.results.IMAGE_URL)
292300
- name: SOURCE_ARTIFACT
293301
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
294302
- name: CACHI2_ARTIFACT
@@ -328,7 +336,7 @@ spec:
328336
- name: name
329337
value: deprecated-image-check
330338
- name: bundle
331-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:2c32152a55f6bfba67b41be456da46b6e109bb3e348e25220eed4eed149958c5
339+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
332340
- name: kind
333341
value: task
334342
resolver: bundles
@@ -337,6 +345,11 @@ spec:
337345
operator: in
338346
values:
339347
- "false"
348+
- matrix:
349+
params:
350+
- name: image-platform
351+
value:
352+
- $(params.build-platforms)
340353
name: clair-scan
341354
params:
342355
- name: image-digest
@@ -563,9 +576,9 @@ spec:
563576
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
564577
- name: ADDITIONAL_TAGS
565578
value:
566-
- "pull-request-{{pull_request_number}}"
567-
- "from-branch-{{source_branch}}"
568-
- "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
579+
- "pull-request-{{pull_request_number}}"
580+
- "from-branch-{{source_branch}}"
581+
- "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
569582
runAfter:
570583
- build-image-index
571584
taskRef:
@@ -633,4 +646,4 @@ spec:
633646
- name: git-auth
634647
secret:
635648
secretName: '{{ git_auth_secret }}'
636-
status: {}
649+
status: {}

‎.tekton/keepalived-9-0-push.yaml‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
- name: revision
2323
value: '{{revision}}'
2424
- name: output-image
25-
value: quay.io/rhceph-ci/keepalived:{{revision}}
25+
value: quay.io/rhceph-ci/keepalived:v9.0-{{revision}}
2626
- name: build-platforms
2727
value:
2828
- linux/x86_64
@@ -117,6 +117,10 @@ spec:
117117
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
118118
name: build-platforms
119119
type: array
120+
- name: buildah-format
121+
default: docker
122+
type: string
123+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
120124
results:
121125
- description: ""
122126
name: IMAGE_URL
@@ -144,7 +148,7 @@ spec:
144148
- name: name
145149
value: init
146150
- name: bundle
147-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
151+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
148152
- name: kind
149153
value: task
150154
resolver: bundles
@@ -194,7 +198,7 @@ spec:
194198
- name: name
195199
value: prefetch-dependencies-oci-ta
196200
- name: bundle
197-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:098322d6b789824f716f2d9caca1862d4afdc083ebaaee61aadd22a8c179480a
201+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
198202
- name: kind
199203
value: task
200204
resolver: bundles
@@ -237,14 +241,16 @@ spec:
237241
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
238242
- name: IMAGE_APPEND_PLATFORM
239243
value: "true"
244+
- name: BUILDAH_FORMAT
245+
value: $(params.buildah-format)
240246
runAfter:
241247
- prefetch-dependencies
242248
taskRef:
243249
params:
244250
- name: name
245251
value: buildah-remote-oci-ta
246252
- name: bundle
247-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:17a0b093c9e9d21e9e374c60a88eb293a0fa57e4e2b67baf20ccac9735aa20ff
253+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:650b0bca57c626c1e82f35cdfadf44a7792230b2b992aaa9c369d615aae6590d
248254
- name: kind
249255
value: task
250256
resolver: bundles
@@ -266,14 +272,16 @@ spec:
266272
- name: IMAGES
267273
value:
268274
- $(tasks.build-images.results.IMAGE_REF[*])
275+
- name: BUILDAH_FORMAT
276+
value: $(params.buildah-format)
269277
runAfter:
270278
- build-images
271279
taskRef:
272280
params:
273281
- name: name
274282
value: build-image-index
275283
- name: bundle
276-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:8e5dfb2fac011148f8715bbe0b99415f88297683d269eae0dfcad52562195d45
284+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
277285
- name: kind
278286
value: task
279287
resolver: bundles
@@ -325,7 +333,7 @@ spec:
325333
- name: name
326334
value: deprecated-image-check
327335
- name: bundle
328-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:2c32152a55f6bfba67b41be456da46b6e109bb3e348e25220eed4eed149958c5
336+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
329337
- name: kind
330338
value: task
331339
resolver: bundles
@@ -565,8 +573,8 @@ spec:
565573
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
566574
- name: ADDITIONAL_TAGS
567575
value:
568-
- "v9.0"
569-
- "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
576+
- "v9.0"
577+
- "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
570578
runAfter:
571579
- build-image-index
572580
taskRef:
@@ -634,4 +642,4 @@ spec:
634642
- name: git-auth
635643
secret:
636644
secretName: '{{ git_auth_secret }}'
637-
status: {}
645+
status: {}

0 commit comments

Comments
 (0)