Run all components in one namespace

[oom.git] / kubernetes / multicloud / templates / multicloud-windriver-deployment.yaml

diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
index a74ea19..2298bee 100644 (file)
--- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
@@ -1,8 +1,9 @@
+#{{ if not .Values.disableMulticloudMulticloudWindriver }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: multicloud-windriver
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -17,11 +18,11 @@ spec:
      containers:
      - env:
        - name: MSB_ADDR
-         value: "{{ .Values.msbgateway }}"
+         value: "{{ tpl .Values.msbgateway . }}"
        - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
-         value: aai-service.{{ .Values.nsPrefix }}-aai
+         value: aai-service.{{ .Values.nsPrefix }}
        - name: AAI_PORT
          value: "8443"
        - name: AAI_SCHEMA_VERSION
@@ -52,8 +53,7 @@ spec:
      volumes:
      - name: windriver-log
        hostPath:
-         path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/windriver/logs
+         path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/windriver/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
-
+#{{ end }}