Commit Graph

18 Commits

Author SHA1 Message Date
Kubernetes Submit Queue
dad41f8526
Merge pull request #54215 from mrahbar/elasticsearch_logging_discovery
Automatic merge from submit-queue (batch tested with PRs 54987, 55221, 54099, 55144, 54215). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

extracted elasticsearch-logging service name as environment variable

**What this PR does / why we need it**:
Deploying the cluster-addon fluentd-elasticsearch with customized resource definitions can cause elasticsearch discovery to fail because the service name `elasticsearch-logging` is hard-coded in  cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
-> none yet

**Special notes for your reviewer**:
The name of the  environment variable is ELASTICSEARCH_SERVICE_NAME. When non is given the fallback service-name  fallback is  `elasticsearch-logging`

```release-note
[fluentd-elasticsearch addon] Elasticsearch service name can be overridden via env variable ELASTICSEARCH_SERVICE_NAME
```
2017-11-10 14:51:33 -08:00
mrahbar
4ecd54f47f extracted elasticsearch-logging service name as environment variable ELASTICSEARCH_SERVICE_NAME with fallback on default 2017-11-10 14:14:22 +01:00
Dr. Stefan Schimanski
012b085ac8 pkg/apis/core: mechanical import fixes in dependencies 2017-11-09 12:14:08 +01:00
yiqinguo
b0c57c081e es discovery support args apiserver-host and kubeconfig 2017-06-20 09:15:23 +08:00
Christian Koep
df80b76d1b
Refactor gcr.io/google_containers/elasticsearch to alpine
Signed-off-by: Christian Koep <christiankoep@gmail.com>
2017-05-15 17:52:39 +02:00
Angus Lees
3390deac31 Fix metav1 typo in previous commit
Fix typo in 469df12038 by using `metav1`
consistently rather than an error-producing mix of `metav1` and
`meta_v1`.
2017-03-10 11:24:22 +11:00
Clayton Coleman
469df12038
refactor: move ListOptions references to metav1 2017-01-23 17:52:46 -05:00
Mik Vyatskov
cd4ee14019 Fix Elasticsearch image for logging and bump version 2017-01-21 17:48:32 +01:00
deads2k
ee6752ef20 find and replace 2017-01-20 08:04:53 -05:00
Jan Chaloupka
4fde09d308 Replace client with clientset in code 2016-10-23 22:00:35 +02:00
David McMahon
ef0c9f0c5b Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
pprokop
fa91b3e461 Adding option to deploy fluentd-elasticsearch in diffrent namespace then kube-system 2016-06-27 18:15:41 +02:00
Kris Rousey
ae6c64d9bb Moving everyone to unversioned client 2015-08-18 10:23:03 -07:00
Mike Danese
17defc7383 run gofmt on everything we touched 2015-08-05 17:52:56 -07:00
Mike Danese
8e33cbfa28 rewrite go imports 2015-08-05 17:30:03 -07:00
Brendan Burns
988aa6fdf6 Move things into a 'kube-system' namespace. 2015-07-06 15:08:23 -07:00
Daniel Smith
40eb1599dd fix elasticsearch 2015-06-03 15:41:09 -07:00
Satnam Singh
7cff506c93 Make the Elasticsearch logging pods discover each other 2015-05-12 15:26:09 -07:00