X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmulticloud%2Fcharts%2Fmulticloud-windriver%2Ftemplates%2Fdeployment.yaml;h=e6f145687496cc495e8af417f87254b5b252d7a1;hb=d37e79b29e2bf8f5d306fa30f4bfbf3c3bb78578;hp=02a78bbd1632e9535d9854a55a5c5c16fdc6e271;hpb=59c67ecb895ecab09c994d8966394e6e36fff74b;p=oom.git

diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
index 02a78bbd16..e6f1456874 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
@@ -1,5 +1,6 @@
 {{/*
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,6 +36,8 @@ spec:
         app: {{ include "common.name" . }}
         release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
+      annotations:
+        sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
     spec:
      containers:
      - env:
@@ -43,7 +46,7 @@ spec:
        - name: MSB_PORT
          value: "{{ .Values.config.msbPort }}"
        - name: AAI_ADDR
-         value: aai-service.{{ include "common.namespace" . }}
+         value: aai.{{ include "common.namespace" . }}
        - name: AAI_PORT
          value: "{{ .Values.config.aai.port }}"
        - name: AAI_SCHEMA_VERSION
@@ -59,7 +62,11 @@ spec:
        - mountPath: /opt/windriver/titanium_cloud/pub/config/log.yml
          name: windriver-logconfig
          subPath: log.yml
-       image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+       - mountPath: /opt/artifacts/
+         name: artifact-data
+       resources:
+{{ include "common.resources" . | indent 12 }}
+       image: "{{ include "common.repository" . }}/{{ .Values.image }}"
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        ports:
        - containerPort: {{ .Values.service.internalPort }}
@@ -68,7 +75,7 @@ spec:
        {{ if .Values.liveness.enabled }}
        livenessProbe:
          httpGet:
-           path: /api/multicloud-titanium_cloud/v0/swagger.json
+           path: /api/multicloud-titaniumcloud/v1/swagger.json
            port: {{ .Values.service.internalPort }}
            scheme: HTTP
          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
@@ -77,17 +84,6 @@ spec:
          successThreshold: {{ .Values.liveness.successThreshold }}
          failureThreshold: {{ .Values.liveness.failureThreshold }}
        {{ end }}
-       resources:
-{{ toYaml .Values.resources | indent 12 }}
-        {{- if .Values.nodeSelector }}
-     nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 10 }}
-     {{- end -}}
-     {{- if .Values.affinity }}
-     affinity:
-{{ toYaml .Values.affinity | indent 10 }}
-     {{- end }}
-
      # side car containers
      - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
@@ -100,6 +96,19 @@ spec:
          name: windriver-log
        - mountPath: /usr/share/filebeat/data
          name: windriver-data-filebeat
+     - image: "{{ include "common.repository" . }}/{{ .Values.global.artifactImage }}"
+       name: framework-artifactbroker
+       command: ["/opt/app/distribution/bin/artifact-dist.sh"]
+       args: ["/opt/app/distribution/etc/mounted/config.json"]
+       ports:
+       - containerPort: 9014
+         protocol: TCP
+       volumeMounts:
+       - mountPath: /opt/app/distribution/etc/mounted/config.json
+         name: windriver-logconfig
+         subPath: config.json
+       - mountPath: /data
+         name: artifact-data
 
      volumes:
      - name: windriver-log
@@ -112,6 +121,8 @@ spec:
      - name: windriver-logconfig
        configMap:
          name: {{ include "common.fullname" . }}-log-configmap
+     - name: artifact-data
+       emptyDir: {}
      imagePullSecrets:
      - name: "{{ include "common.namespace" . }}-docker-registry-key"
      restartPolicy: Always