From 0e44fa6359bf7fc0a1b64d1c111e87c97ec76ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 20 Nov 2018 08:22:26 +0100 Subject: [PATCH 1/5] updated elasticsearch to 6.5.0 --- cluster/addons/fluentd-elasticsearch/es-image/Makefile | 2 +- cluster/addons/fluentd-elasticsearch/es-statefulset.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile index e2b8e68757..164e9f2e3d 100755 --- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile @@ -16,7 +16,7 @@ PREFIX = gcr.io/fluentd-elasticsearch IMAGE = elasticsearch -TAG = v6.3.0 +TAG = v6.5.0 build: gcloud builds submit --tag ${PREFIX}/${IMAGE}:${TAG} \ No newline at end of file diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml index b92bb1b2e3..1f49924fca 100644 --- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml @@ -54,7 +54,7 @@ metadata: namespace: kube-system labels: k8s-app: elasticsearch-logging - version: v6.3.0 + version: v6.5.0 kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile spec: @@ -63,17 +63,17 @@ spec: selector: matchLabels: k8s-app: elasticsearch-logging - version: v6.3.0 + version: v6.5.0 template: metadata: labels: k8s-app: elasticsearch-logging - version: v6.3.0 + version: v6.5.0 kubernetes.io/cluster-service: "true" spec: serviceAccountName: elasticsearch-logging containers: - - image: k8s.gcr.io/elasticsearch:v6.3.0 + - image: k8s.gcr.io/elasticsearch:v6.5.0 name: elasticsearch-logging resources: # need more cpu upon initialization, therefore burstable class From 53a936c359f8be00a0d585dd7848e7f9558fb1b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Thu, 29 Nov 2018 15:45:41 +0100 Subject: [PATCH 2/5] Update Makefile --- cluster/addons/fluentd-elasticsearch/es-image/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile index 164e9f2e3d..6b0a64de79 100755 --- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile @@ -16,7 +16,7 @@ PREFIX = gcr.io/fluentd-elasticsearch IMAGE = elasticsearch -TAG = v6.5.0 +TAG = v6.5.1 build: gcloud builds submit --tag ${PREFIX}/${IMAGE}:${TAG} \ No newline at end of file From 0c29ea1a2e0881bab00c005e96a3de18c76e2069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Thu, 29 Nov 2018 15:46:14 +0100 Subject: [PATCH 3/5] Update es-statefulset.yaml --- cluster/addons/fluentd-elasticsearch/es-statefulset.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml index 1f49924fca..a53e8539d0 100644 --- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml @@ -54,7 +54,7 @@ metadata: namespace: kube-system labels: k8s-app: elasticsearch-logging - version: v6.5.0 + version: v6.5.1 kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile spec: @@ -63,17 +63,17 @@ spec: selector: matchLabels: k8s-app: elasticsearch-logging - version: v6.5.0 + version: v6.5.1 template: metadata: labels: k8s-app: elasticsearch-logging - version: v6.5.0 + version: v6.5.1 kubernetes.io/cluster-service: "true" spec: serviceAccountName: elasticsearch-logging containers: - - image: k8s.gcr.io/elasticsearch:v6.5.0 + - image: k8s.gcr.io/elasticsearch:v6.5.1 name: elasticsearch-logging resources: # need more cpu upon initialization, therefore burstable class From 2d15ffc9cc46bb08dfd3c9199c6f3e586e1e226e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 11 Dec 2018 16:37:59 +0100 Subject: [PATCH 4/5] updated to 6.5.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- cluster/addons/fluentd-elasticsearch/es-image/Dockerfile | 2 +- cluster/addons/fluentd-elasticsearch/es-image/Makefile | 4 ++-- cluster/addons/fluentd-elasticsearch/es-statefulset.yaml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile index 58847372c9..bc53ec0226 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile @@ -17,7 +17,7 @@ COPY elasticsearch_logging_discovery.go go.mod go.sum / RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -ldflags "-w" -o /elasticsearch_logging_discovery /elasticsearch_logging_discovery.go -FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2 +FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.1 VOLUME ["/data"] EXPOSE 9200 9300 diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile index 6b0a64de79..b3e154b16a 100755 --- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile @@ -16,7 +16,7 @@ PREFIX = gcr.io/fluentd-elasticsearch IMAGE = elasticsearch -TAG = v6.5.1 +TAG = v6.6.1 build: - gcloud builds submit --tag ${PREFIX}/${IMAGE}:${TAG} \ No newline at end of file + gcloud builds submit --tag ${PREFIX}/${IMAGE}:${TAG} diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml index a53e8539d0..e1a44eed5f 100644 --- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml @@ -54,7 +54,7 @@ metadata: namespace: kube-system labels: k8s-app: elasticsearch-logging - version: v6.5.1 + version: v6.6.1 kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile spec: @@ -63,17 +63,17 @@ spec: selector: matchLabels: k8s-app: elasticsearch-logging - version: v6.5.1 + version: v6.6.1 template: metadata: labels: k8s-app: elasticsearch-logging - version: v6.5.1 + version: v6.6.1 kubernetes.io/cluster-service: "true" spec: serviceAccountName: elasticsearch-logging containers: - - image: k8s.gcr.io/elasticsearch:v6.5.1 + - image: k8s.gcr.io/elasticsearch:v6.6.1 name: elasticsearch-logging resources: # need more cpu upon initialization, therefore burstable class From 9e2d9cfbb0914869c9701acd2103f6d6bd683a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 26 Feb 2019 09:09:21 +0100 Subject: [PATCH 5/5] changed es image repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- cluster/addons/fluentd-elasticsearch/es-statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml index e1a44eed5f..7964aae8db 100644 --- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml @@ -73,7 +73,7 @@ spec: spec: serviceAccountName: elasticsearch-logging containers: - - image: k8s.gcr.io/elasticsearch:v6.6.1 + - image: gcr.io/fluentd-elasticsearch/elasticsearch:v6.6.1 name: elasticsearch-logging resources: # need more cpu upon initialization, therefore burstable class