Skip to content

Commit a18ba68

Browse files
enarhaaThorp96
andauthored
set GIT_SSL_CAINFO env on resolvers in dev and staging, update pipelines (#7311)
Scaled down the tkn-cli-serve deployment to 0 replicas, as there is an issue with its image in this version and it's not actually used in Konflux. Override the tkn-cli-serve image. Co-authored-by: Andrew Thorp <[email protected]>
1 parent 88c323e commit a18ba68

File tree

4 files changed

+30
-6
lines changed

4 files changed

+30
-6
lines changed

components/pipeline-service/development/main-pipeline-service-configuration.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2083,6 +2083,7 @@ spec:
20832083
memory: 200Mi
20842084
tkn-cli-serve:
20852085
spec:
2086+
replicas: 0
20862087
template:
20872088
spec:
20882089
containers:
@@ -2122,6 +2123,9 @@ spec:
21222123
spec:
21232124
containers:
21242125
- name: controller
2126+
env:
2127+
- name: GIT_SSL_CAINFO
2128+
value: /tekton-custom-certs/ca-bundle.crt
21252129
resources:
21262130
limits:
21272131
memory: 1Gi
@@ -2237,7 +2241,7 @@ metadata:
22372241
namespace: openshift-marketplace
22382242
spec:
22392243
displayName: custom-operators
2240-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2244+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
22412245
sourceType: grpc
22422246
updateStrategy:
22432247
registryPoll:
@@ -2260,6 +2264,8 @@ spec:
22602264
env:
22612265
- name: AUTOINSTALL_COMPONENTS
22622266
value: "false"
2267+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2268+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
22632269
---
22642270
apiVersion: route.openshift.io/v1
22652271
kind: Route

components/pipeline-service/staging/base/main-pipeline-service-configuration.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1900,6 +1900,7 @@ spec:
19001900
memory: 1Gi
19011901
tkn-cli-serve:
19021902
spec:
1903+
replicas: 0
19031904
template:
19041905
spec:
19051906
containers:
@@ -1919,6 +1920,9 @@ spec:
19191920
spec:
19201921
containers:
19211922
- name: controller
1923+
env:
1924+
- name: GIT_SSL_CAINFO
1925+
value: /tekton-custom-certs/ca-bundle.crt
19221926
resources:
19231927
limits:
19241928
memory: 10Gi
@@ -2064,7 +2068,7 @@ metadata:
20642068
namespace: openshift-marketplace
20652069
spec:
20662070
displayName: custom-operators
2067-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2071+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
20682072
sourceType: grpc
20692073
updateStrategy:
20702074
registryPoll:
@@ -2087,6 +2091,8 @@ spec:
20872091
env:
20882092
- name: AUTOINSTALL_COMPONENTS
20892093
value: "false"
2094+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2095+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
20902096
---
20912097
apiVersion: route.openshift.io/v1
20922098
kind: Route

components/pipeline-service/staging/stone-stage-p01/deploy.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2485,6 +2485,7 @@ spec:
24852485
memory: 50Mi
24862486
tkn-cli-serve:
24872487
spec:
2488+
replicas: 0
24882489
template:
24892490
spec:
24902491
containers:
@@ -2558,7 +2559,10 @@ spec:
25582559
template:
25592560
spec:
25602561
containers:
2561-
- name: controller
2562+
- env:
2563+
- name: GIT_SSL_CAINFO
2564+
value: /tekton-custom-certs/ca-bundle.crt
2565+
name: controller
25622566
resources:
25632567
limits:
25642568
memory: 10Gi
@@ -2650,7 +2654,7 @@ metadata:
26502654
namespace: openshift-marketplace
26512655
spec:
26522656
displayName: custom-operators
2653-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2657+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
26542658
sourceType: grpc
26552659
updateStrategy:
26562660
registryPoll:
@@ -2670,6 +2674,8 @@ spec:
26702674
env:
26712675
- name: AUTOINSTALL_COMPONENTS
26722676
value: "false"
2677+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2678+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
26732679
name: openshift-pipelines-operator-rh
26742680
source: custom-operators
26752681
sourceNamespace: openshift-marketplace

components/pipeline-service/staging/stone-stg-rh01/deploy.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2497,6 +2497,7 @@ spec:
24972497
memory: 50Mi
24982498
tkn-cli-serve:
24992499
spec:
2500+
replicas: 0
25002501
template:
25012502
spec:
25022503
containers:
@@ -2570,7 +2571,10 @@ spec:
25702571
template:
25712572
spec:
25722573
containers:
2573-
- name: controller
2574+
- env:
2575+
- name: GIT_SSL_CAINFO
2576+
value: /tekton-custom-certs/ca-bundle.crt
2577+
name: controller
25742578
resources:
25752579
limits:
25762580
memory: 10Gi
@@ -2662,7 +2666,7 @@ metadata:
26622666
namespace: openshift-marketplace
26632667
spec:
26642668
displayName: custom-operators
2665-
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:1ad7bfa236b620db80afbc07261cb25d7024e41333bf9716e2b9d943b04c12a2
2669+
image: quay.io/openshift-pipeline/pipelines-index-4.15@sha256:6788ffeab369f7a773d7022358f67cd93d094003c3b6c82e3278f620e9065135
26662670
sourceType: grpc
26672671
updateStrategy:
26682672
registryPoll:
@@ -2682,6 +2686,8 @@ spec:
26822686
env:
26832687
- name: AUTOINSTALL_COMPONENTS
26842688
value: "false"
2689+
- name: IMAGE_ADDONS_TKN_CLI_SERVE
2690+
value: registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel9@sha256:d055d2b35a663aef3e1aafdbed0b12957867c0670c946ebae66e9c44a768bda2
26852691
name: openshift-pipelines-operator-rh
26862692
source: custom-operators
26872693
sourceNamespace: openshift-marketplace

0 commit comments

Comments
 (0)