X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fcharts%2Faai-sparky-be%2Ftemplates%2Fdeployment.yaml;h=424cf1155d36fa31c181c04e8dc1ed346016bb83;hb=5689d5f064eff1440be723603895947c7d720b15;hp=05a808e805a3fcc5e0cb8c929906cc666d38d558;hpb=f4eea37ac0a03de52c254707887b69626aa9df78;p=oom.git

diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
index 05a808e805..424cf1155d 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
@@ -34,77 +34,62 @@ spec:
         release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
     spec:
-      initContainers:
-      - name: {{ include "common.name" . }}-inject-models
-        command:
-        - /bin/bash
-        - "-c"
-        - |
-          git clone -b {{ .Values.config.gerritBranch }} --single-branch {{ .Values.config.gerritProject }} /tmp/gerrit
-          cp -rp /tmp/gerrit/data-router/appconfig/model/* /model-dir
-        image: "{{ .Values.global.repository | default .Values.dockerHubRepository }}/{{ .Values.ubuntuInitImage }}"
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        volumeMounts:
-        - name: modeldir
-          mountPath: "/model-dir"
       containers:
       - name: {{ include "common.name" . }}
         image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: CONFIG_HOME
-          value: /opt/app/sparky/config/
-        - name: KEY_MANAGER_PASSWORD
-          value: {{ .Values.config.keyManagerPassword }}
-        - name: KEY_STORE_PASSWORD
+          value: /opt/app/sparky/appconfig/
+        - name: KEYSTORE_ALIAS_PASSWORD
+          value: {{ .Values.config.keystoreAliasPassword }}
+        - name: KEYSTORE_PASSWORD
           value: {{ .Values.config.keyStorePassword }}
+        - name: SPARKY_SSL_ENABLED
+          value: 'true'
+        - name: SPARKY_PORTAL_ENABLED
+          value: 'false'
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /opt/app/sparky/config/auth/
+        - mountPath: /opt/app/sparky/appconfig/auth/
           name: {{ include "common.fullname" . }}-auth-config
-        - mountPath: /opt/app/sparky/config/synchronizer.properties
-          subPath: synchronizer.properties
-          name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/suggestive-search.properties
-          subPath: suggestive-search.properties
-          name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/search-service.properties
-          subPath: search-service.properties
-          name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/roles.config
-          subPath: roles.config
+        - mountPath: /opt/app/sparky/appconfig/camel-rests/
+          name: {{ include "common.fullname" . }}-camel-rests-config
+        - mountPath: /opt/app/sparky/appconfig/descriptors/
+          name: {{ include "common.fullname" . }}-descriptors-config
+        - mountPath: /opt/app/sparky/appconfig/filters/
+          name: {{ include "common.fullname" . }}-filters-config
+        - mountPath: /opt/app/sparky/appconfig/
           name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/elasticsearch.properties
-          subPath: elasticsearch.properties
-          name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/aai.properties
-          subPath: aai.properties
-          name: {{ include "common.fullname" . }}-config
-        - mountPath: /opt/app/sparky/config/portal/
+        - mountPath: /opt/app/sparky/appconfig/portal
           name: {{ include "common.fullname" . }}-portal-config
+        - mountPath: /opt/app/sparky/appconfig/portal/BOOT-INF/classes
+          name: {{ include "common.fullname" . }}-portal-boot-inf-config
+        - mountPath: /opt/app/sparky/appconfig/schemas
+          name: {{ include "common.fullname" . }}-schemas-config
+        - mountPath: /opt/app/sparky/appconfig/spring-beans/
+          name: {{ include "common.fullname" . }}-spring-beans-config
         - mountPath: /var/log/onap
           name: {{ include "common.fullname" . }}-logs
-        - mountPath: /opt/app/sparky/bundleconfig/etc/logback.xml
+        - mountPath: /opt/app/sparky/appconfig/logging/
           name: {{ include "common.fullname" . }}-log-conf
-          subPath: logback.xml
-        - name: modeldir
-          mountPath: /opt/app/sparky/config/model
         ports:
         - containerPort: {{ .Values.service.internalPort }}
+        - containerPort: {{ .Values.service.internalPort2 }}
         # disable liveness probe when breakpoints set in debugger
         # so K8s doesn't restart unresponsive container
         {{- if eq .Values.liveness.enabled true }}
         livenessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort }}
+            port: {{ .Values.service.internalPort2 }}
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{ end -}}
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort }}
+            port: {{ .Values.service.internalPort2 }}
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         resources:
@@ -138,12 +123,30 @@ spec:
       - name: {{ include "common.fullname" . }}-config
         configMap:
           name: {{ include "common.fullname" . }}
-      - name: {{ include "common.fullname" . }}-portal-config
-        configMap:
-          name: {{ include "common.fullname" . }}-portal
       - name: {{ include "common.fullname" . }}-auth-config
         secret:
           secretName: {{ include "common.fullname" . }}
+      - name: {{ include "common.fullname" . }}-camel-rests-config
+        configMap:
+          name: {{ include "common.fullname" . }}-camel-rests
+      - name: {{ include "common.fullname" . }}-descriptors-config
+        configMap:
+          name: {{ include "common.fullname" . }}-descriptors
+      - name: {{ include "common.fullname" . }}-filters-config
+        configMap:
+          name: {{ include "common.fullname" . }}-filters
+      - name: {{ include "common.fullname" . }}-portal-config
+        configMap:
+          name: {{ include "common.fullname" . }}-portal
+      - name: {{ include "common.fullname" . }}-portal-boot-inf-config
+        configMap:
+          name: {{ include "common.fullname" . }}-boot-inf
+      - name: {{ include "common.fullname" . }}-schemas-config
+        configMap:
+          name: {{ include "common.fullname" . }}-schemas
+      - name: {{ include "common.fullname" . }}-spring-beans-config
+        configMap:
+          name: {{ include "common.fullname" . }}-spring-beans
       - name: filebeat-conf
         configMap:
           name: aai-filebeat
@@ -153,9 +156,7 @@ spec:
         emptyDir: {}
       - name: {{ include "common.fullname" . }}-log-conf
         configMap:
-         name: {{ include "common.fullname" . }}-log
-      - name: modeldir
-        emptyDir: {}
+          name: {{ include "common.fullname" . }}-log
       restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"