Skip to content

Commit fd06dc7

Browse files
tmshortci-robot
authored andcommitted
UPSTREAM: <carry>: Revert "Handle service-ca cert availability/rotation"
This reverts commit 9cc13d8.
1 parent 8f248f0 commit fd06dc7

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

openshift/catalogd/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_certs.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
path: /spec/template/spec/containers/0/args/-
1818
value: "--tls-key=/var/certs/tls.key"
1919
- op: add
20-
path: /spec/template/spec/containers/0/args/-
21-
value: "--pull-cas-dir=/var/ca-certs"
22-
- op: remove
2320
path: /spec/template/spec/containers/0/env
21+
value: [{"name":"SSL_CERT_DIR", "value":"/var/ca-certs"}]
2422
- op: add
2523
path: /spec/template/spec/securityContext/seLinuxOptions
2624
value: {"type":"spc_t"}

openshift/catalogd/manifests-experimental/18-deployment-openshift-catalogd-catalogd-controller-manager.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ spec:
4646
- --external-address=catalogd-service.openshift-catalogd.svc
4747
- --tls-cert=/var/certs/tls.crt
4848
- --tls-key=/var/certs/tls.key
49-
- --pull-cas-dir=/var/ca-certs
5049
- --v=${LOG_VERBOSITY}
5150
- --feature-gates=APIV1MetasHandler=true
5251
- --global-pull-secret=openshift-config/pull-secret
5352
command:
5453
- ./catalogd
54+
env:
55+
- name: SSL_CERT_DIR
56+
value: /var/ca-certs
5557
image: ${CATALOGD_IMAGE}
5658
imagePullPolicy: IfNotPresent
5759
livenessProbe:

openshift/catalogd/manifests/18-deployment-openshift-catalogd-catalogd-controller-manager.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@ spec:
4646
- --external-address=catalogd-service.openshift-catalogd.svc
4747
- --tls-cert=/var/certs/tls.crt
4848
- --tls-key=/var/certs/tls.key
49-
- --pull-cas-dir=/var/ca-certs
5049
- --v=${LOG_VERBOSITY}
5150
- --global-pull-secret=openshift-config/pull-secret
5251
command:
5352
- ./catalogd
53+
env:
54+
- name: SSL_CERT_DIR
55+
value: /var/ca-certs
5456
image: ${CATALOGD_IMAGE}
5557
imagePullPolicy: IfNotPresent
5658
livenessProbe:

openshift/operator-controller/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_certs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
path: /spec/template/spec/containers/0/args/-
2121
value: "--catalogd-cas-dir=/var/ca-certs"
2222
- op: add
23-
path: /spec/template/spec/containers/0/args/-
24-
value: "--pull-cas-dir=/var/ca-certs"
23+
path: /spec/template/spec/containers/0/env
24+
value: [{"name":"SSL_CERT_DIR", "value":"/var/ca-certs"}]
2525
- op: add
2626
path: /spec/template/spec/securityContext/seLinuxOptions
2727
value: {"type":"spc_t"}

openshift/operator-controller/manifests-experimental/21-deployment-openshift-operator-controller-operator-controller-controller-manager.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,16 @@ spec:
4646
- --tls-cert=/var/certs/tls.crt
4747
- --tls-key=/var/certs/tls.key
4848
- --catalogd-cas-dir=/var/ca-certs
49-
- --pull-cas-dir=/var/ca-certs
5049
- --v=${LOG_VERBOSITY}
5150
- --feature-gates=PreflightPermissions=true
5251
- --feature-gates=SingleOwnNamespaceInstallSupport=true
5352
- --feature-gates=WebhookProviderOpenshiftServiceCA=true
5453
- --global-pull-secret=openshift-config/pull-secret
5554
command:
5655
- /operator-controller
56+
env:
57+
- name: SSL_CERT_DIR
58+
value: /var/ca-certs
5759
image: ${OPERATOR_CONTROLLER_IMAGE}
5860
imagePullPolicy: IfNotPresent
5961
livenessProbe:

openshift/operator-controller/manifests/20-deployment-openshift-operator-controller-operator-controller-controller-manager.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@ spec:
4646
- --tls-cert=/var/certs/tls.crt
4747
- --tls-key=/var/certs/tls.key
4848
- --catalogd-cas-dir=/var/ca-certs
49-
- --pull-cas-dir=/var/ca-certs
5049
- --v=${LOG_VERBOSITY}
5150
- --global-pull-secret=openshift-config/pull-secret
5251
command:
5352
- /operator-controller
53+
env:
54+
- name: SSL_CERT_DIR
55+
value: /var/ca-certs
5456
image: ${OPERATOR_CONTROLLER_IMAGE}
5557
imagePullPolicy: IfNotPresent
5658
livenessProbe:

0 commit comments

Comments
 (0)