X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmulticloud%2Fcharts%2Fmulticloud-starlingx%2Ftemplates%2Fdeployment.yaml;h=80e9a97f3b4ea2af69c8ca1849259fae52fdbc0a;hb=f0dacd23777a7998915afe00150b25135b932f86;hp=0ccc3f9f958bcb31fb3b1cb52dc9243986a635d1;hpb=40ca6802206a732737557ff84b6886756655a5dc;p=oom.git

diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
index 0ccc3f9f95..80e9a97f3b 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 */}}
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.fullname" . }}
@@ -22,7 +22,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -33,13 +33,15 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
       annotations:
         sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
     spec:
      containers:
      - env:
+       - name: MSB_PROTO
+         value: {{ .Values.config.msbprotocol }}
        - name: MSB_ADDR
          value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
        - name: MSB_PORT
@@ -54,6 +56,8 @@ spec:
          value: "{{ .Values.config.aai.username }}"
        - name: AAI_PASSWORD
          value: "{{ .Values.config.aai.password }}"
+       - name: SSL_ENABLED
+         value: "{{ .Values.config.ssl_enabled }}"
        name: {{ include "common.name" . }}
        volumeMounts:
        - mountPath: /var/log/onap
@@ -61,6 +65,8 @@ spec:
        - mountPath: /opt/starlingx/starlingx/pub/config/log.yml
          name: starlingx-logconfig
          subPath: log.yml
+       - mountPath: /opt/artifacts/
+         name: artifact-data
        resources:
 {{ include "common.resources" . | indent 12 }}
        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -74,7 +80,7 @@ spec:
          httpGet:
            path: /api/multicloud-starlingx/v0/swagger.json
            port: {{ .Values.service.internalPort }}
-           scheme: HTTP
+           scheme: HTTPS
          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
          periodSeconds: {{ .Values.liveness.periodSeconds }}
          timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
@@ -93,6 +99,19 @@ spec:
          name: starlingx-log
        - mountPath: /usr/share/filebeat/data
          name: starlingx-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: starlingx-logconfig
+         subPath: config.json
+       - mountPath: /data
+         name: artifact-data
 
      volumes:
      - name: starlingx-log
@@ -105,6 +124,8 @@ spec:
      - name: starlingx-logconfig
        configMap:
          name: {{ include "common.fullname" . }}-log-configmap
+     - name: artifact-data
+       emptyDir: {}
      imagePullSecrets:
      - name: "{{ include "common.namespace" . }}-docker-registry-key"
      restartPolicy: Always