Skip to content

Commit 5e60f15

Browse files
committed
do not autogenerate ssl certs
If someone enables https, they need to provide certs via extra_volumes
1 parent 3ff6f78 commit 5e60f15

File tree

3 files changed

+2
-68
lines changed

3 files changed

+2
-68
lines changed

templates/deployments.yaml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -433,15 +433,11 @@ spec:
433433
- configMapRef:
434434
name: {{ .Release.Name }}-st2-urls
435435
optional: true
436-
{{- if or .Values.st2web.use_https .Values.st2web.config .Values.st2web.postStartScript }}
436+
{{- if or .Values.st2web.config .Values.st2web.postStartScript }}
437437
volumeMounts:
438438
{{- else }}
439439
volumeMounts: []
440440
{{- end }}
441-
{{- if .Values.st2web.use_https }}
442-
- name: st2web-ssl-certs-vol
443-
mountPath: /etc/ssl/st2
444-
{{- end }}
445441
{{- if .Values.st2web.config }}
446442
- name: st2web-config-vol
447443
mountPath: /opt/stackstorm/static/webui/config.js
@@ -461,21 +457,11 @@ spec:
461457
{{- if .Values.st2web.serviceAccount.attach }}
462458
serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
463459
{{- end }}
464-
{{- if or .Values.st2web.use_https .Values.st2web.config .Values.st2web.postStartScript }}
460+
{{- if or .Values.st2web.config .Values.st2web.postStartScript }}
465461
volumes:
466462
{{- else }}
467463
volumes: []
468464
{{- end }}
469-
{{- if .Values.st2web.use_https }}
470-
- name: st2web-ssl-certs-vol
471-
secret:
472-
secretName: {{ .Release.Name }}-st2web-ssl-certs
473-
items:
474-
- key: ssl_certificate
475-
path: st2.crt
476-
- key: ssl_certificate_key
477-
path: st2.key
478-
{{- end }}
479465
{{- if .Values.st2web.config }}
480466
- name: st2web-config-vol
481467
configMap:

templates/secrets_st2web-ssl-certs.yaml

Lines changed: 0 additions & 47 deletions
This file was deleted.

values.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,11 +299,6 @@ st2web:
299299
attach: false
300300
# Have st2web pod and service use HTTPS on port 443 when true. default: false (use HTTP on port 80)
301301
use_https: false
302-
# User-defined st2web ssl certificate+key (ignored for http; defaults to autogenerated for https)
303-
# ssl_certificate: |
304-
# # x.509 certficate
305-
# ssl_certificate_key: |
306-
# # x.509 private key
307302
# User-defined st2web config with custom settings to replace default config.js
308303
# See https://github.com/StackStorm/st2web#connecting-to-st2-server for more info
309304
# config: |

0 commit comments

Comments
 (0)