X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fnetwork-name-gen%2Ftemplates%2Fdeployment.yaml;h=71b7846dc9650a24493b9ec4b7a89b698e53a449;hb=8c55fdd1dc3f78e32d7214353f09dd67831de216;hp=9bdf19c7ec58eacdda59dac1c3f72fc567aef855;hpb=09e9875bd082c067b251189456e821c6ce785bc8;p=oom.git

diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml
index 9bdf19c7ec..71b7846dc9 100644
--- a/kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/common/network-name-gen/templates/deployment.yaml
@@ -16,24 +16,12 @@
 
 apiVersion: apps/v1
 kind: Deployment
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
+  selector: {{- include "common.selectors" . | nindent 4 }}
   replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.name" . }}
   template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}
-        release: {{ include "common.release" . }}
+    metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers:
       - name: {{ include "common.name" . }}-readiness
@@ -80,7 +68,11 @@ spec:
         - name: POL_BASIC_AUTH_PASSWORD
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pol-basic-auth-secret" "key" "password") | indent 10}}
         - name: POL_URL
-          value: "{{ .Values.config.polUrl }}"
+          {{- if (include "common.needTLS" .) }}
+          value: "{{ .Values.config.polUrl.https }}"
+          {{- else }}
+          value: "{{ .Values.config.polUrl.http }}"
+          {{- end }}
         - name: POL_ENV
           value: "{{ .Values.config.polEnv }}"
         - name: POL_REQ_ID
@@ -90,7 +82,11 @@ spec:
         - name: AAI_CERT_PATH
           value: "{{ .Values.config.aaiCertPath }}"
         - name: AAI_URI
-          value: "{{ .Values.config.aaiUri }}"
+          {{- if (include "common.needTLS" .) }}
+          value: "{{ .Values.config.aaiUri.https }}"
+          {{- else }}
+          value: "{{ .Values.config.aaiUri.http }}"
+          {{- end }}
         - name: AAI_AUTH
           value: "{{ .Values.config.aaiAuth }}"
         - name: DISABLE_HOST_VERIFICATION
@@ -100,8 +96,7 @@ spec:
           mountPath: /opt/etc/config/aai_keystore
           subPath: aai_keystore
           readOnly: true
-        resources:
-{{ include "common.resources" . | indent 12 }}
+        resources: {{ include "common.resources" . | nindent 10 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}