X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fpolicy%2Fcomponents%2Fpolicy-clamp-be%2Ftemplates%2Fdeployment.yaml;fp=kubernetes%2Fclamp%2Fcomponents%2Fclamp-backend%2Ftemplates%2Fdeployment.yaml;h=1120f9b2b62a720a254e1f2e3cc765630c9fde33;hb=5c4498813e10d25160a86f97fe7a95ea26f9ef7b;hp=9153f9d0ff790b148d94bda2dc152c2212ad70e0;hpb=f26d9eff22180b8232f2965d347226e2a4999cd3;p=oom.git

diff --git a/kubernetes/clamp/components/clamp-backend/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-be/templates/deployment.yaml
similarity index 90%
rename from kubernetes/clamp/components/clamp-backend/templates/deployment.yaml
rename to kubernetes/policy/components/policy-clamp-be/templates/deployment.yaml
index 9153f9d0ff..1120f9b2b6 100644
--- a/kubernetes/clamp/components/clamp-backend/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/templates/deployment.yaml
@@ -40,8 +40,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
-        - clamp-mariadb
+        - --job-name
+        - {{ include "common.release" . }}-policy-clamp-galera-config
         env:
         - name: NAMESPACE
           valueFrom:
@@ -61,14 +61,14 @@ spec:
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           command:
           - sh
-          workingDir: "/opt/clamp/"
+          workingDir: "/opt/policy/clamp/"
           args:
           - -c
           - |
           {{- if .Values.global.aafEnabled }}
             export $(grep '^cadi_' {{ .Values.certInitializer.credsPath }}/org.onap.clamp.cred.props | xargs -0)
           {{- end }}
-            java -Djava.security.egd=file:/dev/./urandom ${JAVA_RAM_CONFIGURATION} -jar ./app.jar
+            java -Djava.security.egd=file:/dev/./urandom ${JAVA_RAM_CONFIGURATION} -jar ./policy-clamp-backend.jar
           ports:
           - containerPort: {{ .Values.service.internalPort }}
           # disable liveness probe when breakpoints set in debugger
@@ -88,19 +88,17 @@ spec:
           volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
           - name: logs
             mountPath: {{ .Values.log.path }}
-          - mountPath: /opt/clamp/sdc-controllers-config.json
+          - mountPath: /opt/policy/clamp/sdc-controllers-config.json
             name: {{ include "common.fullname" . }}-config
             subPath: sdc-controllers-config.json
-          - mountPath: /opt/clamp/application.properties
+          - mountPath: /opt/policy/clamp/application.properties
             name: {{ include "common.fullname" . }}-config
             subPath: application.properties
           env:
           - name: MYSQL_USER
-            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "login") | indent 12 }}
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-creds" "key" "login") | indent 12 }}
           - name: MYSQL_PASSWORD
-            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "password") | indent 12 }}
-          - name: MYSQL_DATABASE
-            value: {{ tpl .Values.db.databaseName .}}
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-creds" "key" "password") | indent 12 }}
           {{-  if ne "unlimited" (include "common.flavor" .) }}
           - name: JAVA_RAM_CONFIGURATION
             value: -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=75
@@ -115,7 +113,7 @@ spec:
       volumes: {{ include "common.certInitializer.volumes" . | nindent 8 }}
         - name: {{ include "common.fullname" . }}-config
           configMap:
-            name: {{ include "common.fullname" . }}
+            name: {{ include "common.fullname" . }}-configmap
             items:
             - key: sdc-controllers-config.json
               path: sdc-controllers-config.json