Skip to content

Update helm to make secret instead of configmap for Nginx External Cert usage #716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update helm to make secret instead of configmap for Nginx External Cert usage #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a2f9a7
Update _helpers.tpl
paul42 Nov 9, 2021
19dee9c
Update and rename gen-certs-cm.yaml to gen-certs-secret.yaml
paul42 Nov 11, 2021
9f18023
Update nginx-pod.yaml and _helperts.tpl
paul42 Nov 11, 2021
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
4 changes: 2 additions & 2 deletions helm/openwhisk/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,14 @@ imagePullSecrets:
{{/* nginx cert */}}
{{- define "openwhisk.nginx_cert" -}}
{{- if .Values.nginx.certificate.external }}
{{ .Files.Get .Values.nginx.certificate.cert_file }}
{{ .Files.Get .Values.nginx.certificate.cert_file | b64enc }}
{{- end -}}
{{- end -}}

{{/* nginx key */}}
{{- define "openwhisk.nginx_key" -}}
{{- if .Values.nginx.certificate.external }}
{{ .Files.Get .Values.nginx.certificate.key_file }}
{{ .Files.Get .Values.nginx.certificate.key_file | b64enc }}
{{- end -}}
{{- end -}}

Expand Down
2 changes: 1 addition & 1 deletion helm/openwhisk/templates/gen-certs-cm.yaml → ...openwhisk/templates/gen-certs-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

{{- if or (eq .Values.whisk.ingress.type "NodePort") (eq .Values.whisk.ingress.type "LoadBalancer") }}
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: {{ .Release.Name }}-gen-certs
labels:
Expand Down
4 changes: 2 additions & 2 deletions helm/openwhisk/templates/nginx-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ spec:
{{- if or (eq .Values.whisk.ingress.type "NodePort") (eq .Values.whisk.ingress.type "LoadBalancer") }}
{{- if .Values.nginx.certificate.external }}
- name: nginx-certs
configMap:
name: {{ .Release.Name }}-gen-certs
secret:
secretName: {{ .Release.Name }}-gen-certs
{{- else }}
- name: nginx-certs
secret:
Expand Down