X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fnetwork-name-gen%2Ftemplates%2Fdeployment.yaml;h=97fece8a542dd6ff83327046906861aa911c0ced;hb=e4aac7a3c577b7bb9eaae93387d482f952ee4b72;hp=a6d18e7a596c39891cd9aaae2d99c68ce81a98b8;hpb=86de3eeeda61299847aa24f3e61f13c8e0b94322;p=oom.git

diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml
index a6d18e7a59..97fece8a54 100644
--- a/kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/common/network-name-gen/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright (C) 2018  AT&T Intellectual Property.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,8 +12,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+*/}}
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.fullname" . }}
@@ -24,6 +26,9 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ include "common.name" . }}
   template:
     metadata:
       labels:
@@ -31,16 +36,14 @@ spec:
         release: {{ include "common.release" . }}
     spec:
       initContainers:
-{{- if .Values.global.mariadbGalera.localCluster }}
-      - command:
-        - /root/ready.py
+      - name: {{ include "common.name" . }}-readiness
+        command:
+        - /app/ready.py
         args:
+{{- if .Values.global.mariadbGalera.localCluster }}
         - --container-name
         - {{ index .Values "mariadb-galera" "nameOverride" }}
 {{- else }}
-      - command:
-        - /root/job_complete.py
-        args:
         - --job-name
         - {{ include "common.release" . }}-{{ index .Values "mariadb-init" "nameOverride" }}-config-job
 {{- end }}
@@ -50,28 +53,38 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: {{ include "common.name" . }}-readiness
       containers:
       - name: {{ include "common.name" . }}
-        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+        command:
+          - bash
+        args:
+          - '-c'
+          - 'export POL_BASIC_AUTH=`echo -n $POL_BASIC_AUTH_USER:$POL_BASIC_AUTH_PASSWORD | base64`; /startService.sh'
+        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: SPRING_PROFILE
           value: "{{ .Values.config.springProfile }}"
         - name: NENG_DB_USER
-          {{- include "common.secret.envFromSecret" (dict "global" . "uid" "neng-db-secret" "key" "login") | indent 10}}
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "neng-db-secret" "key" "login") | indent 10}}
         - name: NENG_DB_PASS
-          {{- include "common.secret.envFromSecret" (dict "global" . "uid" "neng-db-secret" "key" "password") | indent 10}}
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "neng-db-secret" "key" "password") | indent 10}}
         - name: NENG_DB_URL
-          value: jdbc:mysql://{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}/{{ index .Values "mariadb-galera" "config" "mysqlDatabase" }}
+          value: jdbc:mysql://{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}/{{ index .Values "mariadb-galera" "db" "name" }}
         - name: POL_CLIENT_AUTH
           value: "{{ .Values.config.polClientAuth }}"
-        - name: POL_BASIC_AUTH
-          value: "{{ .Values.config.polBasicAuth }}"
+        - name: POL_BASIC_AUTH_USER
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pol-basic-auth-secret" "key" "login") | indent 10}}
+        - 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
@@ -81,9 +94,15 @@ 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
+          value: "{{ .Values.config.disableHostVerification }}"
         volumeMounts:
         - name: certs
           mountPath: /opt/etc/config/aai_keystore