Merge "Add option to disable specific deployments"

10 files changed, 35 insertions, 6 deletions

diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
index dc375cb6bc..3f714f3e64 100644
--- a/kubernetes/aai/templates/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -68,3 +69,4 @@ spec:
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index b0d437b61d..ebf447f3ca 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiResources }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -112,4 +113,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/resources/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index d2a9c42f3f..a54c49a59d 100644
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiTraversal }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -114,4 +115,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/traversal/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml
index 01e24e8373..df7e3567d0 100644
--- a/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiHbase }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -24,6 +25,8 @@ spec:
   selector:
     app: hbase
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAaiAaiService }}
 ---
 apiVersion: v1
 kind: Service
@@ -162,6 +165,8 @@ spec:
   type: NodePort
   selector:
     app: aai-service
+#{{ end }}
+#{{ if not .Values.disableAaiModelLoaderService }}
 ---
 apiVersion: v1
 kind: Service
@@ -181,6 +186,7 @@ spec:
   type: NodePort
   selector:
     app: model-loader-service
+#{{ end }}
 ---
 apiVersion: v1
 kind: Service
@@ -196,6 +202,7 @@ spec:
   selector:
     app: gremlin
   clusterIP: None
+#{{ if not .Values.disableAaiElasticsearch }}
 ---
 apiVersion: v1
 kind: Service
@@ -211,6 +218,8 @@ spec:
   selector:
     app: elasticsearch
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAaiSearchDataService }}
 ---
 apiVersion: v1
 kind: Service
@@ -226,6 +235,8 @@ spec:
   selector:
     app: search-data-service
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAaiAaiTraversal }}
 ---
 apiVersion: v1
 kind: Service
@@ -243,6 +254,8 @@ spec:
   selector:
     app: aai-traversal
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAaiAaiResources }}
 ---
 apiVersion: v1
 kind: Service
@@ -260,6 +273,8 @@ spec:
   selector:
     app: aai-resources
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAaiSparkyBe }}
 ---
 apiVersion: v1
 kind: Service
@@ -274,4 +289,5 @@ spec:
     port: 9517
   selector:
     app: sparky-be
-  clusterIP: None  
\ No newline at end of file
+  clusterIP: None
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml
index 4473dcf8fe..6b3c024c2a 100644
--- a/kubernetes/aai/templates/data-router-deployment.yaml
+++ b/kubernetes/aai/templates/data-router-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiDataRouter }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -65,3 +66,4 @@ spec:
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml
index 1fc92addfc..680f942c52 100644
--- a/kubernetes/aai/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/aai/templates/elasticsearch-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiElasticsearch }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -45,3 +46,4 @@ spec:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/es-data"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml
index c261504d22..fd8e10cc5a 100644
--- a/kubernetes/aai/templates/hbase-deployment.yaml
+++ b/kubernetes/aai/templates/hbase-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiHbase }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -41,3 +42,4 @@ spec:
           path: /etc/localtime
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml
index f800c446eb..7c2fddb7cf 100644
--- a/kubernetes/aai/templates/modelloader-deployment.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiModelLoaderService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -72,4 +73,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/model-loader/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
index 3eb0c5c714..60fdbb50cd 100644
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiSearchDataService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -80,4 +81,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml
index ee9e067281..c60725ee15 100644
--- a/kubernetes/aai/templates/sparky-be-deployment.yaml
+++ b/kubernetes/aai/templates/sparky-be-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiSparkyBe }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -80,4 +81,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/sparky-be/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}
\ No newline at end of file