summaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2019-08-02 01:45:23 +0000
committerVijay Venkatesh Kumar <vv770d@att.com>2019-08-03 20:25:03 +0000
commita4535c94d838cd0d784fd14ff8497be878c81176 (patch)
treeb7298a72b9dcfde083a0f3ad2e0b01f8d5b37c3e /kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml
parentdc9d4ca49343a5f31175b0247f01246c4ef392ab (diff)
dcae el-alto earlydrop updates with released tag
Following patches into staging are included with corresponding released image tag https://gerrit.onap.org/r/#/c/oom/+/91759/ https://gerrit.onap.org/r/#/c/oom/+/91832/ https://gerrit.onap.org/r/#/c/oom/+/90603/ https://gerrit.onap.org/r/#/c/oom/+/92569/ Change-Id: I369b8a3cb25476e466e61b6b23d3034f17a461b6 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com> Issue-ID: DCAEGEN2-1318 Issue-ID: DCAEGEN2-913 Issue-ID: DCAEGEN2-1685 Issue-ID: DCAEGEN2-1597 Issue-ID: DCAEGEN2-909 Issue-ID: DCAEGEN2-904 Issue-ID: DCAEGEN2-1513 Issue-ID: DCAEGEN2-1550 Issue-ID: DCAEGEN2-1701 Issue-ID: DCAEGEN2-1694 Issue-ID: DCAEGEN2-1695 Issue-ID: DCAEGEN2-1718 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Diffstat (limited to 'kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml')
-rw-r--r--kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml26
1 files changed, 26 insertions, 0 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml
index d6c58cd75f..b3e90a2efb 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml
@@ -34,6 +34,12 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ # host alias allows local 'cfy' command to use https and match
+ # the host name in the certificate
+ hostAliases:
+ - ip: "127.0.0.1"
+ hostnames:
+ - "dcae-cloudify-manager"
initContainers:
- name: {{ include "common.name" . }}-multisite-init
image: {{ include "common.repository" . }}/{{ .Values.multisiteInitImage }}
@@ -44,10 +50,26 @@ spec:
- --configmap
- {{ .Values.multisiteConfigMapName }}
restartPolicy: Never
+ - name: init-tls
+ env:
+ - name: POD_IP
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: status.podIP
+ image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ resources: {}
+ volumeMounts:
+ - mountPath: /opt/tls/shared
+ name: tls-info
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ env:
+ - name: REQUESTS_CA_BUNDLE
+ value: "/opt/onap/certs/cacert.pem"
resources:
{{ include "common.resources" . | indent 12 }}
ports:
@@ -86,6 +108,8 @@ spec:
readOnly: true
- mountPath: /cfy-persist
name: cm-persistent
+ - mountPath: /opt/onap/certs
+ name: tls-info
securityContext:
privileged: True
volumes:
@@ -107,5 +131,7 @@ spec:
- name: cm-persistent
persistentVolumeClaim:
claimName: {{ include "common.fullname" . }}-data
+ - emptyDir: {}
+ name: tls-info
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"