5 files changed, 16 insertions, 6 deletions
diff --git a/kubernetes/multicloud/templates/all-services.yaml b/kubernetes/multicloud/templates/all-services.yaml
index d8de44745e..09a90d0eca 100644
--- a/kubernetes/multicloud/templates/all-services.yaml
+++ b/kubernetes/multicloud/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMulticloudFramework }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -24,6 +25,8 @@ spec:
   selector:
     app: framework
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMulticloudMulticloudVio }}
 ---
 apiVersion: v1
 kind: Service
@@ -52,6 +55,8 @@ spec:
   selector:
     app: multicloud-vio
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMulticloudMulticloudOcata }}
 ---
 apiVersion: v1
 kind: Service
@@ -80,6 +85,8 @@ spec:
   selector:
     app: multicloud-ocata
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMulticloudMulticloudWindriver }}
 ---
 apiVersion: v1
 kind: Service
@@ -108,3 +115,4 @@ spec:
   selector:
     app: multicloud-windriver
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml
index 9f122f0fd2..b2f23715c8 100644
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMulticloudFramework }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -55,3 +56,4 @@ spec:
          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/framework/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
index 8d9bd9d15a..994fe94c03 100644
--- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMulticloudMulticloudOcata }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -55,5 +56,4 @@ spec:
          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/ocata/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
index 85a43a10db..e2274b358f 100644
--- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMulticloudMulticloudVio }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -55,5 +56,4 @@ spec:
          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/vio/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
-
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
index a74ea19f23..ff0f09af19 100644
--- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMulticloudMulticloudWindriver }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -55,5 +56,4 @@ spec:
          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/windriver/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
-
+#{{ end }}
+\ No newline at end of file