Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
path: /spec/template/spec/containers/0/args/-
value: "--tls-key=/var/certs/tls.key"
- op: add
path: /spec/template/spec/containers/0/args/-
value: "--pull-cas-dir=/var/ca-certs"
- op: remove
path: /spec/template/spec/containers/0/env
value: [{"name":"SSL_CERT_DIR", "value":"/var/ca-certs"}]
- op: add
path: /spec/template/spec/securityContext/seLinuxOptions
value: {"type":"spc_t"}
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,12 @@ spec:
- --external-address=catalogd-service.openshift-catalogd.svc
- --tls-cert=/var/certs/tls.crt
- --tls-key=/var/certs/tls.key
- --pull-cas-dir=/var/ca-certs
- --v=${LOG_VERBOSITY}
- --feature-gates=APIV1MetasHandler=true
- --global-pull-secret=openshift-config/pull-secret
command:
- ./catalogd
env:
- name: SSL_CERT_DIR
value: /var/ca-certs
image: ${CATALOGD_IMAGE}
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,11 @@ spec:
- --external-address=catalogd-service.openshift-catalogd.svc
- --tls-cert=/var/certs/tls.crt
- --tls-key=/var/certs/tls.key
- --pull-cas-dir=/var/ca-certs
- --v=${LOG_VERBOSITY}
- --global-pull-secret=openshift-config/pull-secret
command:
- ./catalogd
env:
- name: SSL_CERT_DIR
value: /var/ca-certs
image: ${CATALOGD_IMAGE}
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
path: /spec/template/spec/containers/0/args/-
value: "--catalogd-cas-dir=/var/ca-certs"
- op: add
path: /spec/template/spec/containers/0/env
value: [{"name":"SSL_CERT_DIR", "value":"/var/ca-certs"}]
path: /spec/template/spec/containers/0/args/-
value: "--pull-cas-dir=/var/ca-certs"
- op: add
path: /spec/template/spec/securityContext/seLinuxOptions
value: {"type":"spc_t"}
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,14 @@ spec:
- --tls-cert=/var/certs/tls.crt
- --tls-key=/var/certs/tls.key
- --catalogd-cas-dir=/var/ca-certs
- --pull-cas-dir=/var/ca-certs
- --v=${LOG_VERBOSITY}
- --feature-gates=PreflightPermissions=true
- --feature-gates=SingleOwnNamespaceInstallSupport=true
- --feature-gates=WebhookProviderOpenshiftServiceCA=true
- --global-pull-secret=openshift-config/pull-secret
command:
- /operator-controller
env:
- name: SSL_CERT_DIR
value: /var/ca-certs
image: ${OPERATOR_CONTROLLER_IMAGE}
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,11 @@ spec:
- --tls-cert=/var/certs/tls.crt
- --tls-key=/var/certs/tls.key
- --catalogd-cas-dir=/var/ca-certs
- --pull-cas-dir=/var/ca-certs
- --v=${LOG_VERBOSITY}
- --global-pull-secret=openshift-config/pull-secret
command:
- /operator-controller
env:
- name: SSL_CERT_DIR
value: /var/ca-certs
image: ${OPERATOR_CONTROLLER_IMAGE}
imagePullPolicy: IfNotPresent
livenessProbe:
Expand Down