summaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2/components/dcae-deployment-handler
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2019-09-23 09:02:31 -0400
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-02-12 14:05:31 +0000
commitc70bc7e2bb69ee409d78ba433dbff30f2cac04b9 (patch)
treed1dee1c5cd47e77c42a14ca799c7dbfecb0ba07a /kubernetes/dcaegen2/components/dcae-deployment-handler
parent4e7114252d86f891420318391bcfb6d0f929ed56 (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-deployment-handler')
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml4
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/values.yaml2
2 files changed, 4 insertions, 2 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
index 54beb0933b..9563f94fd9 100644
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
@@ -61,11 +61,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
- name: init-consul
image: {{ .Values.global.consulLoaderRepository }}/{{ .Values.global.consulLoaderImage }}
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/values.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/values.yaml
index 30893b6d7c..c78625227a 100644
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/values.yaml
@@ -25,7 +25,7 @@ global:
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
tlsRepository: nexus3.onap.org:10001
- tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:1.0.3
+ tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
consulLoaderRepository: nexus3.onap.org:10001
consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
repositoryCred: