Run all components in one namespace

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

diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml
index 9f122f0..dcdf0a2 100644 (file)
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@ -1,8 +1,9 @@
+#{{ if not .Values.disableMulticloudFramework }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: framework
-  namespace: "{{ .Values.nsPrefix }}-multicloud"
+  name: multicloud-framework
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -11,17 +12,17 @@ spec:
     metadata:
       labels:
         app: framework
-      name: framework
+      name: multicloud-framework
     spec:
      hostname: framework
      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,6 +53,7 @@ spec:
      volumes:
      - name: framework-log
        hostPath:
-         path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/framework/logs
+         path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/framework/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}