Skip to content

K
k3s
Commit 17793bcc authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #42630 from anguslees/elasticsearch

Automatic merge from submit-queue (batch tested with PRs 41830, 42630) Arrange for elasticsearch to shutdown cleanly Kubernetes initiates "graceful shutdown" by sending SIGTERM to pid 1, which is exactly what elasticsearch is expecting (good!) The way the existing startup scripts worked however, this signal arrived at the shell wrapper, not elasticsearch, and the shell wrapper exited, killing the container immediately (bad!) Before this change: ``` 1 ? Ss 0:00 /bin/sh -c /run.sh 6 ? S 0:00 /bin/bash /run.sh 13 ? S 0:00 \_ /bin/su -c /elasticsearch/bin/elasticsearch elasticsearch 14 ? Ss 0:00 \_ sh -c /elasticsearch/bin/elasticsearch 15 ? Sl 19:18 \_ /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java ... org.elasticsearch.bootstrap.Elasticsearch start ``` After this change: ``` 1 ? Ssl 0:29 /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java ... org.elasticsearch.bootstrap.Elasticsearch start ```
parents 9590f694 3390deac
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 10 deletions
cluster/addons/fluentd-elasticsearch/es-controller.yaml
View file @ 17793bcc
...@@ -21,7 +21,7 @@ spec: ...@@ -21,7 +21,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/elasticsearch:v2.4.1-1 - image: gcr.io/google_containers/elasticsearch:v2.4.1-2
name: elasticsearch-logging name: elasticsearch-logging
resources: resources:
# need more cpu upon initialization, therefore burstable class # need more cpu upon initialization, therefore burstable class
......
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
View file @ 17793bcc
...@@ -23,7 +23,7 @@ ENV DEBIAN_FRONTEND noninteractive ...@@ -23,7 +23,7 @@ ENV DEBIAN_FRONTEND noninteractive
ENV ELASTICSEARCH_VERSION 2.4.1 ENV ELASTICSEARCH_VERSION 2.4.1
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y curl \ && apt-get install -y curl gosu \
&& apt-get clean && apt-get clean
RUN set -x \ RUN set -x \
...@@ -48,4 +48,4 @@ RUN useradd --no-create-home --user-group elasticsearch \ ...@@ -48,4 +48,4 @@ RUN useradd --no-create-home --user-group elasticsearch \
VOLUME ["/data"] VOLUME ["/data"]
EXPOSE 9200 9300 EXPOSE 9200 9300
CMD /run.sh CMD ["/run.sh"]
\ No newline at end of file
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View file @ 17793bcc
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# The current value of the tag to be used for building and # The current value of the tag to be used for building and
# pushing an image to gcr.io # pushing an image to gcr.io
TAG = v2.4.1-1 TAG = v2.4.1-2
build: elasticsearch_logging_discovery build: elasticsearch_logging_discovery
docker build --pull -t gcr.io/google_containers/elasticsearch:$(TAG) . docker build --pull -t gcr.io/google_containers/elasticsearch:$(TAG) .
......
cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
View file @ 17793bcc
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
...@@ -56,7 +56,7 @@ func main() { ...@@ -56,7 +56,7 @@ func main() {
namespace := metav1.NamespaceSystem namespace := metav1.NamespaceSystem
envNamespace := os.Getenv("NAMESPACE") envNamespace := os.Getenv("NAMESPACE")
if envNamespace != "" { if envNamespace != "" {
if _, err := client.Core().Namespaces().Get(envNamespace, meta_v1.GetOptions{}); err != nil { if _, err := client.Core().Namespaces().Get(envNamespace, metav1.GetOptions{}); err != nil {
glog.Fatalf("%s namespace doesn't exist: %v", envNamespace, err) glog.Fatalf("%s namespace doesn't exist: %v", envNamespace, err)
} }
namespace = envNamespace namespace = envNamespace
...@@ -66,7 +66,7 @@ func main() { ...@@ -66,7 +66,7 @@ func main() {
// Look for endpoints associated with the Elasticsearch loggging service. // Look for endpoints associated with the Elasticsearch loggging service.
// First wait for the service to become available. // First wait for the service to become available.
for t := time.Now(); time.Since(t) < 5*time.Minute; time.Sleep(10 * time.Second) { for t := time.Now(); time.Since(t) < 5*time.Minute; time.Sleep(10 * time.Second) {
elasticsearch, err = client.Core().Services(namespace).Get("elasticsearch-logging", meta_v1.GetOptions{}) elasticsearch, err = client.Core().Services(namespace).Get("elasticsearch-logging", metav1.GetOptions{})
if err == nil { if err == nil {
break break
} }
...@@ -83,7 +83,7 @@ func main() { ...@@ -83,7 +83,7 @@ func main() {
// Wait for some endpoints. // Wait for some endpoints.
count := 0 count := 0
for t := time.Now(); time.Since(t) < 5*time.Minute; time.Sleep(10 * time.Second) { for t := time.Now(); time.Since(t) < 5*time.Minute; time.Sleep(10 * time.Second) {
endpoints, err = client.Core().Endpoints(namespace).Get("elasticsearch-logging", meta_v1.GetOptions{}) endpoints, err = client.Core().Endpoints(namespace).Get("elasticsearch-logging", metav1.GetOptions{})
if err != nil { if err != nil {
continue continue
} }
......
cluster/addons/fluentd-elasticsearch/es-image/run.sh
View file @ 17793bcc
...@@ -25,4 +25,4 @@ export MINIMUM_MASTER_NODES=${MINIMUM_MASTER_NODES:-2} ...@@ -25,4 +25,4 @@ export MINIMUM_MASTER_NODES=${MINIMUM_MASTER_NODES:-2}
chown -R elasticsearch:elasticsearch /data chown -R elasticsearch:elasticsearch /data
/bin/su -c /elasticsearch/bin/elasticsearch elasticsearch exec gosu elasticsearch /elasticsearch/bin/elasticsearch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment