From 40eb1599dd4671df3f1a625289e62d18c0b45c64 Mon Sep 17 00:00:00 2001
From: Daniel Smith <dbsmith@google.com>
Date: Tue, 2 Jun 2015 13:39:10 -0700
Subject: [PATCH] fix elasticsearch

---
 .../fluentd-elasticsearch/es-controller.yaml    | 10 ++--------
 .../fluentd-elasticsearch/es-image/Makefile     | 10 +++++++---
 .../es-image/elasticsearch_logging_discovery.go | 17 +----------------
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
index 3722209c020..42cd434d952 100644
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
@@ -20,7 +20,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-      - image: gcr.io/google_containers/elasticsearch:1.3
+      - image: gcr.io/google_containers/elasticsearch:1.4
         name: elasticsearch-logging
         ports:
         - containerPort: 9200
@@ -30,14 +30,8 @@ spec:
           name: es-transport-port
           protocol: TCP
         volumeMounts:
-        - name: token-system-logging
-          mountPath: /etc/token-system-logging
-          readOnly: true
         - name: es-persistent-storage
           mountPath: /data
       volumes:
-      - name: token-system-logging
-        secret:
-          secretName: token-system-logging
       - name: es-persistent-storage
-        emptyDir: {}
\ No newline at end of file
+        emptyDir: {}
diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
index 254ed333094..2d4e5df6126 100755
--- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
@@ -1,12 +1,16 @@
 .PHONY:	elasticsearch_logging_discovery build push
 
-TAG = 1.3
+# Keep this one version ahead to help prevent accidental pushes.
+TAG = 1.4
 
-build:	elasticsearch_logging_discovery	
+build:	elasticsearch_logging_discovery
 	docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .
 
-push:	
+push:
 	gcloud preview docker push gcr.io/google_containers/elasticsearch:$(TAG)
 
 elasticsearch_logging_discovery:
 	go build elasticsearch_logging_discovery.go
+
+clean:
+	rm elasticsearch_logging_discovery
diff --git a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
index 6b3e6364227..89e78c1459a 100644
--- a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
+++ b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
@@ -24,14 +24,9 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"
 	"github.com/golang/glog"
 )
 
-var (
-	kubeconfig = flag.String("kubeconfig", "/etc/token-system-logging/kubeconfig", "kubeconfig file for access")
-)
-
 func flattenSubsets(subsets []api.EndpointSubset) []string {
 	ips := []string{}
 	for _, ss := range subsets {
@@ -46,17 +41,7 @@ func main() {
 	flag.Parse()
 	glog.Info("Kubernetes Elasticsearch logging discovery")
 
-	settings, err := clientcmd.LoadFromFile(*kubeconfig)
-	if err != nil {
-		glog.Fatalf("Error loading configuration from %s: %v", *kubeconfig, err.Error())
-	}
-
-	config, err := clientcmd.NewDefaultClientConfig(*settings, &clientcmd.ConfigOverrides{}).ClientConfig()
-	if err != nil {
-		glog.Fatalf("Failed to construct config: %v", err)
-	}
-
-	c, err := client.New(config)
+	c, err := client.NewInCluster()
 	if err != nil {
 		glog.Fatalf("Failed to make client: %v", err)
 	}