github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27937 from PiotrProkop/fluentd-elasticsearch-fix

Browse Source 
Automatic merge from submit-queue

Adding option to deploy fluentd-elasticsearch in different namespace.

Fixes #27608 .
This commit is contained in:
k8s-merge-robot 2016-06-28 05:54:52 -07:00 committed by GitHub
commit 9f53b07b5b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
View File

@ -19,6 +19,7 @@ package main
import (
"flag"
"fmt"
"os"
"strings"
"time"
@ -45,12 +46,20 @@ func main() {
if err != nil {
glog.Fatalf("Failed to make client: %v", err)
}
namespace := api.NamespaceSystem
envNamespace := os.Getenv("NAMESPACE")
if envNamespace != "" {
if _, err := c.Namespaces().Get(envNamespace); err != nil {
glog.Fatalf("%s namespace doesn't exist: %v", envNamespace, err)
}
namespace = envNamespace
}
var elasticsearch *api.Service
// Look for endpoints associated with the Elasticsearch loggging service.
// First wait for the service to become available.
for t := time.Now(); time.Since(t) < 5*time.Minute; time.Sleep(10 * time.Second) {
elasticsearch, err = c.Services(api.NamespaceSystem).Get("elasticsearch-logging")
elasticsearch, err = c.Services(namespace).Get("elasticsearch-logging")
if err == nil {
break
}
@ -67,7 +76,7 @@ func main() {
// Wait for some endpoints.
count := 0
for t := time.Now(); time.Since(t) < 5*time.Minute; time.Sleep(10 * time.Second) {
endpoints, err = c.Endpoints(api.NamespaceSystem).Get("elasticsearch-logging")
endpoints, err = c.Endpoints(namespace).Get("elasticsearch-logging")
if err != nil {
continue
}