summaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
diff options
context:
space:
mode:
authorrope252 <gareth.roper@est.tech>2022-07-25 20:00:36 +0100
committerVijay Venkatesh Kumar <vv770d@att.com>2022-11-09 17:53:02 +0000
commit5a7fbeed35622045afb31de494cb42e83f85821b (patch)
treea9f01b943654d3c8b57022096f3e91753b45203e /kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
parent1735ebc9d275f450c8043567e8e861e8206459ac (diff)
[DCAE] DCAEGEN2-Services Service Mesh Patch
Service Mesh patch for DCAE, changing port names to http. Remove aaf-cm readiness check, set tlsServer to false (excluding restconf) Added environment variables to pods to solve CBS problems Disable VES authentcation in SM override Change-Id: I42a12912f471d89bd4ebc6181f5454140e54a605 Issue-ID: OOM-2820 Issue-ID: DCAEGEN2-3277 Signed-off-by: rope252 <gareth.roper@est.tech> Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Diffstat (limited to 'kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl')
-rw-r--r--kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl25
1 files changed, 24 insertions, 1 deletions
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
index 0b076ad08b..93efe98846 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl
@@ -238,7 +238,7 @@ post-processing.
{{- define "dcaegen2-services-common.microserviceDeployment" -}}
{{- $log := default dict .Values.log -}}
{{- $logDir := default "" $log.path -}}
-{{- $certDir := default "" .Values.certDirectory . -}}
+{{- $certDir := (eq "true" (include "common.needTLS" .)) | ternary (default "" .Values.certDirectory . ) "" -}}
{{- $tlsServer := default "" .Values.tlsServer -}}
{{- $commonRelease := print (include "common.release" .) -}}
{{- $policy := default dict .Values.policies -}}
@@ -257,9 +257,32 @@ spec:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
initContainers:
+ {{- if .Values.readinessCheck }}
{{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
+ {{- end }}
{{- include "common.dmaap.provisioning.initContainer" . | nindent 6 }}
{{- if $certDir }}
+ - name: {{ include "common.name" . }}-aaf-init-readiness
+ image: {{ include "repositoryGenerator.image.readiness" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ command:
+ - /app/ready.py
+ args:
+ - --container-name
+ - aaf-cm
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ resources:
+ limits:
+ cpu: 100m
+ memory: 100Mi
+ requests:
+ cpu: 3m
+ memory: 20Mi
- name: init-tls
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.tlsImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}