X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Ftemplates%2Fmodelloader-deployment.yaml;h=33458c772a719e996befb53deda2bb09517f0146;hb=e04b2feb855e5ab20e28c867d2bd7f89f6b8c425;hp=96c9ee19903714227ccfc7480da29a8f49a38b65;hpb=fdc176253250ac0100a15b0d08fe752e2b5cb701;p=oom.git

diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml
index 96c9ee1990..33458c772a 100644
--- a/kubernetes/aai/templates/modelloader-deployment.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment.yaml
@@ -1,9 +1,25 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+#{{ if not .Values.disableAaiModelLoaderService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: model-loader-service
-  namespace: {{ .Values.NS }}
+  name: aai-model-loader-service
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.modelLoaderReplicas }}
   selector:
     matchLabels:
       app: model-loader-service
@@ -11,89 +27,64 @@ spec:
     metadata:
       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": "onap-sdc"
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "model-loader-sdc-readiness"
-          }
-          ]'
+      name: aai-model-loader-service
     spec:
       containers:
-      - env:
-        - name: DISTR_CLIENT_ASDC_ADDRESS
-          value: sdc-be.onap-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.onap-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: model-loader-service
+        image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
-        name: model-loader-service
+        env:
+        - name: CONFIG_HOME
+          value: /opt/app/model-loader/config/
+        volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
+        - mountPath: /opt/app/model-loader/config/model-loader.properties
+          subPath: model-loader.properties
+          name: aai-model-loader-prop-config
+        - mountPath: /opt/app/model-loader/config/auth/
+          name: aai-model-loader-auth-config
+        - mountPath: /var/log/onap
+          name: aai-model-loader-logs
+        - mountPath: /opt/app/model-loader/bundleconfig/etc/logback.xml
+          name: aai-model-loader-log-conf
+          subPath: logback.xml
         ports:
         - containerPort: 8080
         - containerPort: 8443
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
+      - name: filebeat-onap-aai-model-loader
+        image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          subPath: filebeat.yml
+          name: filebeat-conf
+        - mountPath: /var/log/onap
+          name: aai-model-loader-logs
+        - mountPath: /usr/share/filebeat/data
+          name: aai-model-loader-filebeat
+      volumes:
+      - name: localtime
+        hostPath:
+          path: /etc/localtime
+      - name: aai-model-loader-prop-config
+        configMap:
+          name: aai-model-loader-prop-configmap
+      - name: aai-model-loader-auth-config
+        secret:
+          secretName: aai-model-loader-secret
+      - name: filebeat-conf
+        configMap:
+          name: aai-filebeat-configmap
+      - name: aai-model-loader-logs
+        emptyDir: {}
+      - name: aai-model-loader-filebeat
+        emptyDir: {}
+      - name: aai-model-loader-log-conf
+        configMap:
+         name: aai-model-loader-log-configmap
       restartPolicy: Always
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}