scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39861 from Traum-Ferienwohnungen/hostname_as_nodename

Browse Source 
Automatic merge from submit-queue

Use $HOSTNAME as node.name by default

**What this PR does / why we need it**:
Allows to identify elasticsearch instances more easily.
As $HOSTNAME of a pod is unique, this should be no problem.
This commit is contained in:
Kubernetes Submit Queue
2017-01-17 04:57:09 -08:00
committed by GitHub
parent 0bd13332e9 6b3284acd2
commit 002cdfa1ae
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/addons/fluentd-elasticsearch/es-image/config/elasticsearch.yml
View File

@@ -1,5 +1,6 @@
cluster.name: kubernetes-logging cluster.name: kubernetes-logging
node.name: ${NODE_NAME}
node.master: ${NODE_MASTER} node.master: ${NODE_MASTER}
node.data: ${NODE_DATA} node.data: ${NODE_DATA}

1
cluster/addons/fluentd-elasticsearch/es-image/run.sh
View File

@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
export NODE_NAME=${NODE_NAME:-${HOSTNAME}}
export NODE_MASTER=${NODE_MASTER:-true} export NODE_MASTER=${NODE_MASTER:-true}
export NODE_DATA=${NODE_DATA:-true} export NODE_DATA=${NODE_DATA:-true}
export HTTP_PORT=${HTTP_PORT:-9200} export HTTP_PORT=${HTTP_PORT:-9200}