Skip to content

Commit 877bb68

Browse files
Merge branch 'release-v1.17' into konflux/references/release-v1.17
2 parents 192432a + c265431 commit 877bb68

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

.tekton/docker-build.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp:
54
labels:
65
pipelines.openshift.io/runtime: generic
76
pipelines.openshift.io/strategy: docker
@@ -83,6 +82,9 @@ spec:
8382
description: The format for the resulting image's mediaType. Valid values are oci or docker.
8483
name: buildah-format
8584
type: string
85+
- default: "false"
86+
description: Enable cache proxy configuration
87+
name: enable-cache-proxy
8688
- default: []
8789
description: Array of --build-arg values ("arg=value" strings) for buildah
8890
name: build-args
@@ -268,6 +270,10 @@ spec:
268270
value: $(tasks.clone-repository.results.url)
269271
- name: BUILDAH_FORMAT
270272
value: $(params.buildah-format)
273+
- name: HTTP_PROXY
274+
value: $(tasks.init.results.http-proxy)
275+
- name: NO_PROXY
276+
value: $(tasks.init.results.no-proxy)
271277
- name: SOURCE_ARTIFACT
272278
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
273279
- name: CACHI2_ARTIFACT
@@ -544,7 +550,7 @@ spec:
544550
- name: name
545551
value: rpms-signature-scan
546552
- name: bundle
547-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:da66f14b1a3f2c2ec1e02a3183941ee4230ea4ac4a36515342c97bdb2fe905e0
553+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:2f3015ac7a642ea7f104d2194a8cb45921570f9539c6604ddcb5f62796f22a53
548554
- name: kind
549555
value: task
550556
resolver: bundles

.tekton/net-istio-controller-117-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
2929
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
3030
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
31-
- VERSION=1.37.0
31+
- VERSION=1.37.1
3232
- name: git-url
3333
value: '{{source_url}}'
3434
- name: hermetic

.tekton/net-istio-controller-117-push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
2828
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
2929
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
30-
- VERSION=1.37.0
30+
- VERSION=1.37.1
3131
- name: git-url
3232
value: '{{source_url}}'
3333
- name: hermetic
@@ -39,7 +39,7 @@ spec:
3939
- name: additional-tags
4040
value:
4141
- $(context.pipelineRun.uid)-{{revision}}
42-
- 1.37.0
42+
- 1.37.1
4343
- latest
4444
taskRunSpecs:
4545
- pipelineTaskName: sast-shell-check

.tekton/net-istio-webhook-117-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
2929
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
3030
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
31-
- VERSION=1.37.0
31+
- VERSION=1.37.1
3232
- name: git-url
3333
value: '{{source_url}}'
3434
- name: hermetic

.tekton/net-istio-webhook-117-push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
2828
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
2929
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
30-
- VERSION=1.37.0
30+
- VERSION=1.37.1
3131
- name: git-url
3232
value: '{{source_url}}'
3333
- name: hermetic
@@ -39,7 +39,7 @@ spec:
3939
- name: additional-tags
4040
value:
4141
- $(context.pipelineRun.uid)-{{revision}}
42-
- 1.37.0
42+
- 1.37.1
4343
- latest
4444
taskRunSpecs:
4545
- pipelineTaskName: sast-shell-check

0 commit comments

Comments
 (0)