github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Stopped the token argument from being passed to the elasticsearch_discovery script. It was no longer needed after kubernetes/kubernetes#12621 was merged. The token argument causes the script to error out and stops Elasticsearch nodes from forming a cluster.

Browse Source 
Bumped docker tag from 1.1 to 1.2 and updated README and RC config to reference updated version.
This commit is contained in:
Shaun Parker 2015-08-29 14:48:42 -06:00
parent 650bf71cf7
commit 6db9b3c302
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/elasticsearch/Makefile
View File

@ -1,6 +1,6 @@
.PHONY: elasticsearch_discovery build push all .PHONY: elasticsearch_discovery build push all
TAG = 1.1 TAG = 1.2
build: elasticsearch_discovery build: elasticsearch_discovery
docker build -t kubernetes/elasticsearch:$(TAG) . docker build -t kubernetes/elasticsearch:$(TAG) .

6
examples/elasticsearch/README.md
View File

@ -67,7 +67,7 @@ spec:
spec: spec:
containers: containers:
- name: es - name: es
image: kubernetes/elasticsearch:1.1 image: kubernetes/elasticsearch:1.2
env: env:
- name: "CLUSTER_NAME" - name: "CLUSTER_NAME"
value: "mytunes-db" value: "mytunes-db"
@ -126,7 +126,7 @@ Let's check to see if the replication controller and pods are running:
```console ```console
$ kubectl get rc,pods --namespace=mytunes $ kubectl get rc,pods --namespace=mytunes
CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS
music-db es kubernetes/elasticsearch:1.1 name=music-db 4 music-db es kubernetes/elasticsearch:1.2 name=music-db 4
NAME READY STATUS RESTARTS AGE NAME READY STATUS RESTARTS AGE
music-db-5p46b 1/1 Running 0 34s music-db-5p46b 1/1 Running 0 34s
music-db-8re0f 1/1 Running 0 34s music-db-8re0f 1/1 Running 0 34s
@ -199,7 +199,7 @@ music-db-8re0f 1/1 Running 0 7m
music-db-eq8j0 1/1 Running 0 7m music-db-eq8j0 1/1 Running 0 7m
music-db-uq5px 1/1 Running 0 7m music-db-uq5px 1/1 Running 0 7m
CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS
music-db es kubernetes/elasticsearch:1.1 name=music-db 4 music-db es kubernetes/elasticsearch:1.2 name=music-db 4
NAME LABELS SELECTOR IP(S) PORT(S) NAME LABELS SELECTOR IP(S) PORT(S)
music-server name=music-db name=music-db 10.0.185.179 9200/TCP music-server name=music-db name=music-db 10.0.185.179 9200/TCP
104.197.114.130 104.197.114.130

2
examples/elasticsearch/music-rc.yaml
View File

@ -16,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: es - name: es
image: kubernetes/elasticsearch:1.1 image: kubernetes/elasticsearch:1.2
env: env:
- name: "CLUSTER_NAME" - name: "CLUSTER_NAME"
value: "mytunes-db" value: "mytunes-db"

3
examples/elasticsearch/run.sh
View File

@ -18,8 +18,7 @@ export CLUSTER_NAME=${CLUSTER_NAME:-elasticsearch-default}
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 MULTICAST=${MULTICAST:-false} export MULTICAST=${MULTICAST:-false}
readonly TOKEN=$(cat /etc/apiserver-secret/token) /elasticsearch_discovery --namespace="${NAMESPACE}" --selector="${SELECTOR}" >> /elasticsearch-1.5.2/config/elasticsearch.yml
/elasticsearch_discovery --namespace="${NAMESPACE}" --token="${TOKEN}" --selector="${SELECTOR}" >> /elasticsearch-1.5.2/config/elasticsearch.yml
export HTTP_PORT=${HTTP_PORT:-9200} export HTTP_PORT=${HTTP_PORT:-9200}
export TRANSPORT_PORT=${TRANSPORT_PORT:-9300} export TRANSPORT_PORT=${TRANSPORT_PORT:-9300}
/elasticsearch-1.5.2/bin/elasticsearch /elasticsearch-1.5.2/bin/elasticsearch