4 files changed, 10 insertions, 0 deletions
diff --git a/kubernetes/mso/templates/all-services.yaml b/kubernetes/mso/templates/all-services.yaml
index 96c7fd79e8..44e47c10fc 100644
--- a/kubernetes/mso/templates/all-services.yaml
+++ b/kubernetes/mso/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsoMariadb }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@ spec:
   selector:
     app: mariadb
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMsoMso }}
 ---
 apiVersion: v1
 kind: Service
@@ -60,3 +63,4 @@ spec:
       port: 8787
       nodePort: {{ .Values.nodePortPrefix }}50
   type: NodePort
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml
index d105744f7e..820d7e2239 100644
--- a/kubernetes/mso/templates/db-deployment.yaml
+++ b/kubernetes/mso/templates/db-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsoMariadb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -55,3 +56,4 @@ spec:
             claimName: mso-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml
index bf350aeca1..a33d9b08fa 100644
--- a/kubernetes/mso/templates/mso-deployment.yaml
+++ b/kubernetes/mso/templates/mso-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsoMso }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -144,3 +145,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+\ No newline at end of file
diff --git a/kubernetes/mso/templates/mso-pv-pvc.yaml b/kubernetes/mso/templates/mso-pv-pvc.yaml
index 47389e3ff0..07b5a03f61 100644
--- a/kubernetes/mso/templates/mso-pv-pvc.yaml
+++ b/kubernetes/mso/templates/mso-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsoMariadb }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-mso-db"
+#{{ end }}
+\ No newline at end of file