Skip to content

Commit b049064

Browse files
awgreenekevinrizza
authored andcommitted
Update OLM Deployment template
The olm deployment template will only use HTTPS when values.olm.tlsSecret is set in the values.yaml file. Signed-off-by: Alexander Greene <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: f1a3e5d917a8c7dc73c30a97a4099571c999f630
1 parent a85c642 commit b049064

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

staging/operator-lifecycle-manager/deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ spec:
8787
httpGet:
8888
path: /healthz
8989
port: {{ .Values.olm.service.internalPort }}
90-
scheme: {{ if or .Values.olm.tlsSecret .Values.olm.clientCASecret }}HTTPS{{ else }}HTTP{{end}}
90+
scheme: {{ if .Values.olm.tlsSecret }}HTTPS{{ else }}HTTP{{end}}
9191
readinessProbe:
9292
httpGet:
9393
path: /healthz
9494
port: {{ .Values.olm.service.internalPort }}
95-
scheme: {{ if or .Values.olm.tlsSecret .Values.olm.clientCASecret }}HTTPS{{ else }}HTTP{{end}}
95+
scheme: {{ if .Values.olm.tlsSecret }}HTTPS{{ else }}HTTP{{end}}
9696
terminationMessagePolicy: FallbackToLogsOnError
9797
env:
9898
- name: OPERATOR_NAMESPACE

values.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ catalog:
4545
internalPort: 8443
4646
externalPort: 8443
4747
clientCASecret: catalog-operator-serving-cert
48-
tlsKeyPath: foo
49-
tlsCertPath: bar
5048
tlsSecret: catalog-operator-serving-cert
5149
nodeSelector:
5250
kubernetes.io/os: linux

0 commit comments

Comments
 (0)