Skip to content

Commit 886c73b

Browse files
enarhaenarha
authored
Set GIT_SSL_CAINFO env on Pipeline resolvers prod (#7315)
Also override the tkn-cli-serve image, as the image ref is broken in that latest release. tkn-cli-serve is not used anyway, so this should have no impact.
1 parent 063320e commit 886c73b

File tree

9 files changed

+62
-17
lines changed

9 files changed

+62
-17
lines changed

‎components/pipeline-service/production/base/main-pipeline-service-configuration.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1915,6 +1915,9 @@ spec:
19151915
spec:
19161916
containers:
19171917
- name: controller
1918+
env:
1919+
- name: GIT_SSL_CAINFO
1920+
value: /tekton-custom-certs/ca-bundle.crt
19181921
resources:
19191922
limits:
19201923
memory: 10Gi
@@ -2052,7 +2055,7 @@ metadata:
20522055
namespace: openshift-marketplace
20532056
spec:
20542057
displayName: custom-operators
2055-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2058+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
20562059
sourceType: grpc
20572060
updateStrategy:
20582061
registryPoll:
@@ -2075,6 +2078,8 @@ spec:
20752078
env:
20762079
- name: AUTOINSTALL_COMPONENTS
20772080
value: "false"
2081+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2082+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
20782083
---
20792084
apiVersion: route.openshift.io/v1
20802085
kind: Route

‎components/pipeline-service/production/kflux-ocp-p01/deploy.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,7 +2421,10 @@ spec:
24212421
template:
24222422
spec:
24232423
containers:
2424-
- name: controller
2424+
- env:
2425+
- name: GIT_SSL_CAINFO
2426+
value: /tekton-custom-certs/ca-bundle.crt
2427+
name: controller
24252428
resources:
24262429
limits:
24272430
memory: 10Gi
@@ -2513,7 +2516,7 @@ metadata:
25132516
namespace: openshift-marketplace
25142517
spec:
25152518
displayName: custom-operators
2516-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2519+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
25172520
sourceType: grpc
25182521
updateStrategy:
25192522
registryPoll:
@@ -2533,6 +2536,8 @@ spec:
25332536
env:
25342537
- name: AUTOINSTALL_COMPONENTS
25352538
value: "false"
2539+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2540+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
25362541
name: openshift-pipelines-operator-rh
25372542
source: custom-operators
25382543
sourceNamespace: openshift-marketplace

‎components/pipeline-service/production/kflux-osp-p01/deploy.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2452,7 +2452,10 @@ spec:
24522452
template:
24532453
spec:
24542454
containers:
2455-
- name: controller
2455+
- env:
2456+
- name: GIT_SSL_CAINFO
2457+
value: /tekton-custom-certs/ca-bundle.crt
2458+
name: controller
24562459
resources:
24572460
limits:
24582461
memory: 10Gi
@@ -2544,7 +2547,7 @@ metadata:
25442547
namespace: openshift-marketplace
25452548
spec:
25462549
displayName: custom-operators
2547-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2550+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
25482551
sourceType: grpc
25492552
updateStrategy:
25502553
registryPoll:
@@ -2564,6 +2567,8 @@ spec:
25642567
env:
25652568
- name: AUTOINSTALL_COMPONENTS
25662569
value: "false"
2570+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2571+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
25672572
name: openshift-pipelines-operator-rh
25682573
source: custom-operators
25692574
sourceNamespace: openshift-marketplace

‎components/pipeline-service/production/kflux-prd-rh02/deploy.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2452,7 +2452,10 @@ spec:
24522452
template:
24532453
spec:
24542454
containers:
2455-
- name: controller
2455+
- env:
2456+
- name: GIT_SSL_CAINFO
2457+
value: /tekton-custom-certs/ca-bundle.crt
2458+
name: controller
24562459
resources:
24572460
limits:
24582461
memory: 10Gi
@@ -2544,7 +2547,7 @@ metadata:
25442547
namespace: openshift-marketplace
25452548
spec:
25462549
displayName: custom-operators
2547-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2550+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
25482551
sourceType: grpc
25492552
updateStrategy:
25502553
registryPoll:
@@ -2564,6 +2567,8 @@ spec:
25642567
env:
25652568
- name: AUTOINSTALL_COMPONENTS
25662569
value: "false"
2570+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2571+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
25672572
- name: IMAGE_PIPELINES_PROXY
25682573
value: quay.io/openshift-pipeline/pipelines-operator-proxy-rhel9@sha256:e37a2b061eff6984f8d341825e5989e459de4125322e33480ac01dce5a57c801
25692574
name: openshift-pipelines-operator-rh

‎components/pipeline-service/production/kflux-prd-rh03/deploy.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2452,7 +2452,10 @@ spec:
24522452
template:
24532453
spec:
24542454
containers:
2455-
- name: controller
2455+
- env:
2456+
- name: GIT_SSL_CAINFO
2457+
value: /tekton-custom-certs/ca-bundle.crt
2458+
name: controller
24562459
resources:
24572460
limits:
24582461
memory: 10Gi
@@ -2544,7 +2547,7 @@ metadata:
25442547
namespace: openshift-marketplace
25452548
spec:
25462549
displayName: custom-operators
2547-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2550+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
25482551
sourceType: grpc
25492552
updateStrategy:
25502553
registryPoll:
@@ -2564,6 +2567,8 @@ spec:
25642567
env:
25652568
- name: AUTOINSTALL_COMPONENTS
25662569
value: "false"
2570+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2571+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
25672572
name: openshift-pipelines-operator-rh
25682573
source: custom-operators
25692574
sourceNamespace: openshift-marketplace

‎components/pipeline-service/production/kflux-rhel-p01/deploy.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2452,7 +2452,10 @@ spec:
24522452
template:
24532453
spec:
24542454
containers:
2455-
- name: controller
2455+
- env:
2456+
- name: GIT_SSL_CAINFO
2457+
value: /tekton-custom-certs/ca-bundle.crt
2458+
name: controller
24562459
resources:
24572460
limits:
24582461
memory: 10Gi
@@ -2545,7 +2548,7 @@ metadata:
25452548
namespace: openshift-marketplace
25462549
spec:
25472550
displayName: custom-operators
2548-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2551+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
25492552
sourceType: grpc
25502553
updateStrategy:
25512554
registryPoll:
@@ -2565,6 +2568,8 @@ spec:
25652568
env:
25662569
- name: AUTOINSTALL_COMPONENTS
25672570
value: "false"
2571+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2572+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
25682573
name: openshift-pipelines-operator-rh
25692574
source: custom-operators
25702575
sourceNamespace: openshift-marketplace

‎components/pipeline-service/production/stone-prd-rh01/deploy.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,7 +2421,10 @@ spec:
24212421
template:
24222422
spec:
24232423
containers:
2424-
- name: controller
2424+
- env:
2425+
- name: GIT_SSL_CAINFO
2426+
value: /tekton-custom-certs/ca-bundle.crt
2427+
name: controller
24252428
resources:
24262429
limits:
24272430
memory: 10Gi
@@ -2514,7 +2517,7 @@ metadata:
25142517
namespace: openshift-marketplace
25152518
spec:
25162519
displayName: custom-operators
2517-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2520+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
25182521
sourceType: grpc
25192522
updateStrategy:
25202523
registryPoll:
@@ -2534,6 +2537,8 @@ spec:
25342537
env:
25352538
- name: AUTOINSTALL_COMPONENTS
25362539
value: "false"
2540+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2541+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
25372542
name: openshift-pipelines-operator-rh
25382543
source: custom-operators
25392544
sourceNamespace: openshift-marketplace

‎components/pipeline-service/production/stone-prod-p01/deploy.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,7 +2421,10 @@ spec:
24212421
template:
24222422
spec:
24232423
containers:
2424-
- name: controller
2424+
- env:
2425+
- name: GIT_SSL_CAINFO
2426+
value: /tekton-custom-certs/ca-bundle.crt
2427+
name: controller
24252428
resources:
24262429
limits:
24272430
memory: 10Gi
@@ -2514,7 +2517,7 @@ metadata:
25142517
namespace: openshift-marketplace
25152518
spec:
25162519
displayName: custom-operators
2517-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2520+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
25182521
sourceType: grpc
25192522
updateStrategy:
25202523
registryPoll:
@@ -2534,6 +2537,8 @@ spec:
25342537
env:
25352538
- name: AUTOINSTALL_COMPONENTS
25362539
value: "false"
2540+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2541+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
25372542
name: openshift-pipelines-operator-rh
25382543
source: custom-operators
25392544
sourceNamespace: openshift-marketplace

‎components/pipeline-service/production/stone-prod-p02/deploy.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,7 +2421,10 @@ spec:
24212421
template:
24222422
spec:
24232423
containers:
2424-
- name: controller
2424+
- env:
2425+
- name: GIT_SSL_CAINFO
2426+
value: /tekton-custom-certs/ca-bundle.crt
2427+
name: controller
24252428
resources:
24262429
limits:
24272430
memory: 10Gi
@@ -2514,7 +2517,7 @@ metadata:
25142517
namespace: openshift-marketplace
25152518
spec:
25162519
displayName: custom-operators
2517-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2520+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
25182521
sourceType: grpc
25192522
updateStrategy:
25202523
registryPoll:
@@ -2534,6 +2537,8 @@ spec:
25342537
env:
25352538
- name: AUTOINSTALL_COMPONENTS
25362539
value: "false"
2540+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2541+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
25372542
name: openshift-pipelines-operator-rh
25382543
source: custom-operators
25392544
sourceNamespace: openshift-marketplace

0 commit comments

Comments
 (0)