Merge pull request kubernetes#6426 from satnam6502/kibana-image

Update Kibana to v1.2 which paramaterizes location of Elasticsearch
duda · Apr 3, 2015 · 93d5c81 · 93d5c81
2 parents f96fbfe + cfb8577
commit 93d5c81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -12,7 +12,7 @@ desiredState:
         id: kibana-viewer
         containers:
           - name: kibana-logging
-            image: gcr.io/google_containers/kibana:1.1
+            image: gcr.io/google_containers/kibana:1.2
             env: 
               - name: "ES_SCHEME"
                 value: "https"

diff --git a/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile b/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
@@ -1,6 +1,6 @@
 .PHONY:	build push
 
-TAG = 1.1
+TAG = 1.2
 
 build:
 	docker build -t gcr.io/google_containers/kibana:$(TAG) .