X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdcaemod%2Fcomponents%2Fdcaemod-runtime-api%2Ftemplates%2Fdeployment.yaml;h=39044465dc844b4708771e2a1fa8c9d97b371c61;hb=e4aac7a3c577b7bb9eaae93387d482f952ee4b72;hp=5a52e10d6e74c70e08dac76db0bec537be6dd8d9;hpb=a9a3a49dc0ea71b84c435e732811510bcea655b0;p=oom.git

diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
index 5a52e10d6e..39044465dc 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
@@ -1,6 +1,7 @@
+{{/*
 #============LICENSE_START========================================================
 # ================================================================================
-# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
+*/}}
 
 apiVersion: apps/v1
 kind: Deployment
@@ -26,7 +28,7 @@ spec:
     spec:
       containers:
         - name: {{ include "common.name" . }}
-          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports: {{ include "common.containerPorts" . | nindent 12  }}
           {{- if eq .Values.liveness.enabled true }}
@@ -42,6 +44,17 @@ spec:
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           resources: {{ include "common.resources" . | nindent 12 }}
+          volumeMounts:
+            - mountPath: {{ .Values.config.basehelmchartlocation }}/base/values.yaml
+              subPath: values.yaml
+              name: dcae-helmgen-base
+            - mountPath: {{ .Values.config.basehelmchartlocation }}/base/Chart.yaml
+              subPath: Chart.yaml
+              name: dcae-helmgen-base
+            - mountPath: {{ .Values.config.basehelmchartlocation }}/base/templates
+              name: dcae-helmgen-templates
+            - mountPath: {{ .Values.config.basehelmchartlocation }}/addons/templates
+              name: dcae-helmgen-addon-templates
           env:
             - name: DASHBOARD_URL
               value: {{ .Values.config.dashboardURL }}
@@ -57,11 +70,38 @@ spec:
               value: {{ .Values.config.importK8S }}
             - name: ONAP_IMPORT_POLICYPLUGIN
               value: {{ .Values.config.importPolicy }}
-            - name: ONAP_INPORT_POSTGRESPLUGIN
+            - name: ONAP_IMPORT_POSTGRESPLUGIN
               value: {{ .Values.config.importPostgres }}
             - name: ONAP_IMPORT_CLAMPPLUGIN
               value: {{ .Values.config.importClamp }}
             - name: ONAP_IMPORT_DMAAPPLUGIN
               value: {{ .Values.config.importDMaaP }}
+            - name: ONAP_USEDMAAPPLUGIN
+              value: {{ .Values.config.useDmaapPlugin | quote }}
+            - name: BP_RESOURCES_CPU_LIMIT
+              value: {{ .Values.config.bpResourcesCpuLimit }}
+            - name: BP_RESOURCES_MEMORY_LIMIT
+              value: {{ .Values.config.bpResourcesMemoryLimit }}
+            - name: ARTIFACT_TYPE
+              value: {{ .Values.config.artifactType }}
+            - name: CHARTMUSEUM_BASEURL
+              value: {{ .Values.config.registryBaseurl }}
+            - name: HELM_BASE_CHART_TEMPLATE_LOCATION
+              value: {{ .Values.config.basehelmchartlocation }}
+            - name: CHARTMUSEUM_AUTH_BASIC_USERNAME
+              {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "registrycred" "key" "login") | indent 14 }}
+            - name: CHARTMUSEUM_AUTH_BASIC_PASSWORD
+              {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "registrycred" "key" "password") | indent 14 }}
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       imagePullSecrets:
         - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      volumes:
+        - name: dcae-helmgen-templates
+          configMap:
+            name: {{ include "common.fullname" . }}-dcae-helmgen-templates
+        - name: dcae-helmgen-base
+          configMap:
+            name: {{ include "common.fullname" . }}-dcae-helmgen-base
+        - name: dcae-helmgen-addon-templates
+          configMap:
+            name: {{ include "common.fullname" . }}-dcae-helmgen-addons-templates
\ No newline at end of file