This patch introduces a new structure of the it/dep repo.

[it/dep.git] / ric-platform / 50-RIC-Platform / helm / appmgr / templates / deployment.yaml

diff --git a/ricplt/appmgr/charts/appmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
similarity index 85%
rename from ricplt/appmgr/charts/appmgr/templates/deployment.yaml
rename to ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
index ea189e6..52e5339 100644 (file)
--- a/ricplt/appmgr/charts/appmgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
@@ -39,21 +39,13 @@ spec:
         app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
         release: {{ .Release.Name }}
     spec:
-      hostname: {{ include "common.namespace" . }}-{{ include "common.name" . }}
+      hostname: {{ .Chart.Name }}
       imagePullSecrets:
         - name: {{ .Values.image.repositoryCred }}
-      hostAliases:
-        # create a DNS name entry in container's /etc/hosts for resolving helm chart repo hostnaem
-        - ip: "${__RUNRICENV_DOCKER_IP__}"
-          hostnames:
-            - "${__RUNRICENV_DOCKER_HOST__}"
-        - ip: "${__RUNRICENV_HELMREPO_IP__}"
-          hostnames:
-            - "${__RUNRICENV_HELMREPO_HOST__}"
       containers:
         - name: {{ include "common.namespace" . }}-{{ include "common.name" . }}
-          image: "{{ .Values.image.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ include "common.repository" . }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
+          imagePullPolicy: {{ include "common.pullPolicy" . }}
           ports:
             - name: http
               containerPort: {{ .Values.containerPort }}
@@ -106,7 +98,7 @@ spec:
             name: {{ include "appmgr.fullname" . }}-appconfig
         - name: secret-volume
           secret:
-            secretName: {{ .Values.appsecretobject }}
+            secretName: {{ include "common.helmrepositorycred" . }}
         - name: cert-volume
           configMap:
-            name: {{ .Values.appcertobject }}
+            name: {{ include "common.helmrepositorycert" . }}