Skip to content

Commit 0a7ae3f

Browse files
committed
Separate internal proxy host and port into different params. Try print env variables.
1 parent 61963d0 commit 0a7ae3f

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

deploy/tasks/buildah-oci-ta.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,11 @@ spec:
146146
- name: PROXY_TARGET_WHITELIST
147147
description: Comma separated whitelist of target hosts for the domain proxy.
148148
type: string
149-
- name: INTERNAL_PROXY_ADDRESS
150-
description: Host and port of proxy used internally by the domain proxy.
149+
- name: INTERNAL_PROXY_HOST
150+
description: Host of proxy used internally by the domain proxy.
151+
type: string
152+
- name: INTERNAL_PROXY_PORT
153+
description: Port of proxy used internally by the domain proxy.
151154
type: string
152155
- name: INTERNAL_PROXY_USER
153156
description: User of proxy used internally by the domain proxy.
@@ -249,8 +252,10 @@ spec:
249252
value: $(params.BYTE_BUFFER_SIZE)
250253
- name: PROXY_TARGET_WHITELIST
251254
value: $(params.PROXY_TARGET_WHITELIST)
252-
- name: INTERNAL_PROXY_ADDRESS
253-
value: $(params.INTERNAL_PROXY_ADDRESS)
255+
- name: INTERNAL_PROXY_HOST
256+
value: $(params.INTERNAL_PROXY_HOST)
257+
- name: INTERNAL_PROXY_PORT
258+
value: $(params.INTERNAL_PROXY_PORT)
254259
- name: INTERNAL_PROXY_USER
255260
value: $(params.INTERNAL_PROXY_USER)
256261
- name: INTERNAL_PROXY_PASSWORD
@@ -324,6 +329,9 @@ spec:
324329
exit 1
325330
fi
326331
332+
echo "Env variables:"
333+
env
334+
327335
dockerfile_copy=$(mktemp --tmpdir "$(basename "$dockerfile_path").XXXXXX")
328336
cp "$dockerfile_path" "$dockerfile_copy"
329337

pkg/reconciler/dependencybuild/buildrecipeyaml.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,17 +560,24 @@ func createPipelineSpec(log logr.Logger, tool string, commitTime int64, jbsConfi
560560
},
561561
},
562562
{
563-
Name: "INTERNAL_PROXY_ADDRESS",
563+
Name: "INTERNAL_PROXY_HOST",
564564
Value: tektonpipeline.ParamValue{
565565
Type: tektonpipeline.ParamTypeString,
566-
StringVal: "indy-generic-proxy:80",
566+
StringVal: "indy-generic-proxy",
567+
},
568+
},
569+
{
570+
Name: "INTERNAL_PROXY_PORT",
571+
Value: tektonpipeline.ParamValue{
572+
Type: tektonpipeline.ParamTypeString,
573+
StringVal: "80",
567574
},
568575
},
569576
{
570577
Name: "INTERNAL_PROXY_USER",
571578
Value: tektonpipeline.ParamValue{
572579
Type: tektonpipeline.ParamTypeString,
573-
StringVal: "${BUILD_ID}+tracking",
580+
StringVal: buildId + "+tracking",
574581
},
575582
},
576583
{

0 commit comments

Comments
 (0)