diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2019-09-23 09:02:31 -0400 |
|---|---|---|
| committer |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-02-12 14:05:31 +0000 |
| commit | c70bc7e2bb69ee409d78ba433dbff30f2cac04b9 (patch) | |
| tree | d1dee1c5cd47e77c42a14ca799c7dbfecb0ba07a /kubernetes/dcaegen2/components/dcae-cloudify-manager/templates | |
| parent | 4e7114252d86f891420318391bcfb6d0f929ed56 (diff) | |
Pick up new tls init container
Remove unneeded dashboard inputs file
Prepend release name to filebeat configmap name
Issue-ID: DCAEGEN2-917
Issue-ID: DCAEGEN2-1923
Issue-ID: DCAEGEN2-1805
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: I53ef20046d7e16c4e0a2defd41c846d91af4ec09
Diffstat (limited to 'kubernetes/dcaegen2/components/dcae-cloudify-manager/templates')
| -rw-r--r-- | kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml index b8dadaae89..f1add2dac1 100644 --- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml +++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml @@ -27,7 +27,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: dcae-filebeat-configmap + name: {{ include "common.release" . }}-dcae-filebeat-configmap namespace: {{include "common.namespace" . }} data: {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }} @@ -42,7 +42,7 @@ metadata: apiVersion: v1 kind: ConfigMap metadata: - name: dcae-filebeat-configmap + name: {{ include "common.release" . }}-dcae-filebeat-configmap namespace: {{ .Values.dcae_ns }} data: {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }} diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml index d843290be1..9bee0510cd 100644 --- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml +++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml @@ -57,11 +57,13 @@ spec: fieldRef: apiVersion: v1 fieldPath: status.podIP + - name: aaf_locator_fqdn + value: dcae image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} resources: {} volumeMounts: - - mountPath: /opt/tls/shared + - mountPath: /opt/app/osaaf name: tls-info containers: - name: {{ include "common.name" . }} |