AAI 1.1 K8s templates and aelm branch merge

[oom.git] / kubernetes / aai / templates / modelloader-deployment.yaml

diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml
index f7d855b..5391273 100644 (file)
--- a/kubernetes/aai/templates/modelloader-deployment.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment.yaml
@@ -12,88 +12,29 @@ spec:
       labels:
         app: model-loader-service
       name: model-loader-service
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "aai-service"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "model-loader-readiness"
-          },
-          {
-              "args": [
-                  "--container-name",
-                  "sdc-es",
-                  "--container-name",
-                  "sdc-cs",
-                  "--container-name",
-                  "sdc-kb",
-                  "--container-name",
-                  "sdc-be",
-                  "--container-name",
-                  "sdc-fe"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "value": "{{ .Values.nsPrefix }}-sdc"
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "model-loader-sdc-readiness"
-          }
-          ]'
     spec:
       containers:
       - env:
-        - name: DISTR_CLIENT_ASDC_ADDRESS
-          value: sdc-be.{{ .Values.nsPrefix }}-sdc:8443
-        - name: DISTR_CLIENT_ENVIRONMENT_NAME
-          value: AUTO
-        - name: DISTR_CLIENT_USER
-          value: aai
-        - name: DISTR_CLIENT_PASSWORD
-          value: OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
-        - name: APP_SERVER_BASE_URL
-          value: https://aai-service.{{ .Values.nsPrefix }}-aai:8443
-        - name: APP_SERVER_KEYSTORE_PASSWORD
-          value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-        - name: APP_SERVER_AUTH_USER
-          value: ModelLoader
-        - name: APP_SERVER_AUTH_PASSWORD
-          value: OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw
-        image: {{ .Values.image.modelLoader }}
+        - name: CONFIG_HOME
+          value: /opt/app/model-loader/config/
+        volumeMounts:
+        - mountPath: /opt/app/model-loader/config/
+          name: aai-model-loader-config
+        - mountPath: /logs/
+          name: aai-model-loader-logs
+        image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: model-loader-service
         ports:
         - containerPort: 8080
         - containerPort: 8443
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
+      volumes:
+      - name: aai-model-loader-config
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/"
+      - name: aai-model-loader-logs
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/logs/"
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"