[stable/elastic-stack] Add ability to disable kibana (helm#11117)

* [Add] Possiblity to disable kibana Signed-off-by: --replace-all <[email protected]> * Update requirement.lock and fix condition Signed-off-by: --replace-all <[email protected]>
agolo · Feb 4, 2019 · 2311cf1 · 2311cf1
1 parent a591333
commit 2311cf1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/stable/elastic-stack/Chart.yaml b/stable/elastic-stack/Chart.yaml
@@ -3,7 +3,7 @@ description: A Helm chart for ELK
 home: https://www.elastic.co/products
 icon: https://www.elastic.co/assets/bltb35193323e8f1770/logo-elastic-stack-lt.svg
 name: elastic-stack
-version: 1.4.1
+version: 1.5.0
 appVersion: 6.0
 maintainers:
 - name: rendhalver

diff --git a/stable/elastic-stack/requirements.lock b/stable/elastic-stack/requirements.lock
@@ -1,22 +1,22 @@
 dependencies:
 - name: elasticsearch
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.17.0
+  version: 1.18.1
 - name: kibana
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.1.2
+  version: 1.4.1
 - name: filebeat
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.1.2
+  version: 1.2.0
 - name: logstash
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.4.2
+  version: 1.5.0
 - name: fluentd
   repository: https://kubernetes-charts.storage.googleapis.com/
   version: 1.4.0
 - name: fluent-bit
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.3.0
+  version: 1.5.2
 - name: fluentd-elasticsearch
   repository: https://kubernetes-charts.storage.googleapis.com/
   version: 1.5.0
@@ -25,9 +25,9 @@ dependencies:
   version: 0.1.2
 - name: elasticsearch-curator
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.0.1
+  version: 1.1.0
 - name: elasticsearch-exporter
   repository: https://kubernetes-charts.storage.googleapis.com/
   version: 0.4.1
-digest: sha256:1fd4a059ff9264193884b83644fd057216c384cc5a0debfe8347e9433bd7d1e2
-generated: 2019-01-14T14:58:05.877505741-05:00
+digest: sha256:8455d84f9a92b252ce877037f85082eba25a7d5828a5f73dbfba19179232f3f1
+generated: 2019-02-04T12:54:51.901881528+01:00
diff --git a/stable/elastic-stack/requirements.yaml b/stable/elastic-stack/requirements.yaml
@@ -6,6 +6,7 @@ dependencies:
 - name: kibana
   version: ^1.1.0
   repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: kibana.enabled
 - name: filebeat
   version: ^1.0.0
   repository: https://kubernetes-charts.storage.googleapis.com/

diff --git a/stable/elastic-stack/templates/NOTES.txt b/stable/elastic-stack/templates/NOTES.txt
@@ -1,5 +1,6 @@
 The elasticsearch cluster and associated extras have been installed.
 
+{{- if .Values.kibana.enabled }}
 Kibana can be accessed:
 
   * Within your cluster, at the following DNS name at port 9200:
@@ -29,3 +30,4 @@ Kibana can be accessed:
     echo "Visit http://127.0.0.1:5601 to use Kibana"
     kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 5601:5601
     {{- end }}
+{{- end }}
diff --git a/stable/elastic-stack/values.yaml b/stable/elastic-stack/values.yaml
@@ -5,6 +5,7 @@ elasticsearch:
   enabled: true
 
 kibana:
+  enabled: true
   env:
     ELASTICSEARCH_URL: http://http.default.svc.cluster.local:9200
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ elasticsearch: @@
       enabled: true
     kibana:
+      enabled: true
       env:
         ELASTICSEARCH_URL: http://http.default.svc.cluster.local:9200
@@ Expand Down @@