diff options
author | 2019-05-24 18:01:35 +0000 | |
---|---|---|
committer | 2019-05-24 18:01:35 +0000 | |
commit | e70063cde611b25e8ce8983db570b46eaaab14e6 (patch) | |
tree | d01753fa01a4b84f20549c38ad5c9df8bf0d60bd /kubernetes/clamp/charts/clamp-dash-kibana/templates | |
parent | 744e1a114b26ae4a82a344bd14d4648d06a7821c (diff) | |
parent | 10e3a8bcd4627db15e96e1737dcc72665a034717 (diff) |
Merge "kibana https only"
Diffstat (limited to 'kubernetes/clamp/charts/clamp-dash-kibana/templates')
-rw-r--r-- | kubernetes/clamp/charts/clamp-dash-kibana/templates/configmap.yaml | 9 | ||||
-rw-r--r-- | kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/templates/configmap.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/templates/configmap.yaml index 9186cd919a..8fcd405fa9 100644 --- a/kubernetes/clamp/charts/clamp-dash-kibana/templates/configmap.yaml +++ b/kubernetes/clamp/charts/clamp-dash-kibana/templates/configmap.yaml @@ -25,3 +25,12 @@ metadata: heritage: {{ .Release.Service }} data: {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "common.fullname" . }}-aaf-pem-keys + namespace: {{ include "common.namespace" . }} +type: Opaque +data: +{{ tpl (.Files.Glob "resources/certs/*").AsSecrets . | indent 2 }} diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml index d29148fe71..31752fc661 100644 --- a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml +++ b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml @@ -75,6 +75,8 @@ spec: - mountPath: /usr/share/kibana/config/kibana.yml name: {{ include "common.fullname" . }} subPath: kibana.yml + - name: {{ include "common.fullname" . }}-aaf-pem-certs + mountPath: /usr/share/kibana/config/keystore/ resources: {{ include "common.resources" . | indent 12 }} {{- if .Values.nodeSelector }} @@ -95,5 +97,8 @@ spec: items: - key: kibana.yml path: kibana.yml + - name: {{ include "common.fullname" . }}-aaf-pem-certs + secret: + secretName: {{ include "common.fullname" . }}-aaf-pem-keys imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |