Merge pull request #79014 from monotek/efkupdate

updated fluentd to 1.5.1, es & kibana to 7.1.1

cluster/addons/fluentd-elasticsearch/README.md

@@ -85,7 +85,7 @@ avoid Fluentd pods scheduling there.
 
 ## Running EFK stack in production
 
-The configurations provided here, for Elasticsearch, Fluentd & Kibana (EFK),
+The configurations provided here for Elasticsearch, Fluentd & Kibana (EFK),
 are a starting point and should not be considered to be production ready.
 
 If you like to run these tools in a production environment you could use the

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.7.2
+FROM docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.1
 
 VOLUME ["/data"]
 EXPOSE 9200 9300

cluster/addons/fluentd-elasticsearch/es-image/Makefile

@@ -16,7 +16,7 @@
 
 PREFIX = quay.io/fluentd_elasticsearch
 IMAGE = elasticsearch
-TAG = v6.7.2
+TAG = v7.1.1
 
 build:
 	docker build  --tag ${PREFIX}/${IMAGE}:${TAG} .

cluster/addons/fluentd-elasticsearch/es-statefulset.yaml

@@ -51,7 +51,7 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: elasticsearch-logging
-    version: v6.6.1
+    version: v7.1.1
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   serviceName: elasticsearch-logging
@@ -59,16 +59,16 @@ spec:
   selector:
     matchLabels:
       k8s-app: elasticsearch-logging
-      version: v6.7.2
+      version: v7.1.1
   template:
     metadata:
       labels:
         k8s-app: elasticsearch-logging
-        version: v6.7.2
+        version: v7.1.1
     spec:
       serviceAccountName: elasticsearch-logging
       containers:
-      - image: gcr.io/fluentd-elasticsearch/elasticsearch:v6.6.1
+      - image: quay.io/fluentd_elasticsearch/elasticsearch:v7.1.1
         name: elasticsearch-logging
         resources:
           # need more cpu upon initialization, therefore burstable class

cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml

@@ -45,22 +45,22 @@ roleRef:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: fluentd-es-v2.5.2
+  name: fluentd-es-v2.6.0
   namespace: kube-system
   labels:
     k8s-app: fluentd-es
-    version: v2.5.2
+    version: v2.6.0
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   selector:
     matchLabels:
       k8s-app: fluentd-es
-      version: v2.5.2
+      version: v2.6.0
   template:
     metadata:
       labels:
         k8s-app: fluentd-es
-        version: v2.5.2
+        version: v2.6.0
       # This annotation ensures that fluentd does not get evicted if the node
       # supports critical pod annotation based priority scheme.
       # Note that this does not guarantee admission on the nodes (#40573).
@@ -72,7 +72,7 @@ spec:
       serviceAccountName: fluentd-es
       containers:
       - name: fluentd-es
-        image: gcr.io/fluentd-elasticsearch/fluentd:v2.5.2
+        image: quay.io/fluentd_elasticsearch/fluentd:v2.6.0
         env:
         - name: FLUENTD_ARGS
           value: --no-supervisor -q

cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile

@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
-gem 'activesupport', '~>5.2.2'
-gem 'fluentd', '<=1.4.2'
+gem 'activesupport', '~>5.2.3'
+gem 'fluentd', '<=1.5.1'
 gem 'fluent-plugin-concat', '~>2.3.0'
 gem 'fluent-plugin-detect-exceptions', '~>0.0.12'
-gem 'fluent-plugin-elasticsearch', '~>3.4.3'
-gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.6'
+gem 'fluent-plugin-elasticsearch', '~>3.5.2'
+gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.2.0'
 gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
-gem 'fluent-plugin-prometheus', '~>1.3.0'
+gem 'fluent-plugin-prometheus', '~>1.4.0'
 gem 'fluent-plugin-systemd', '~>1.0.2'
 gem 'oj', '~>3.7.12'

cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile

@@ -16,7 +16,7 @@
 
 PREFIX = quay.io/fluentd_elasticsearch
 IMAGE = fluentd
-TAG = v2.5.2
+TAG = v2.6.0
 
 build:
 	docker build  --tag ${PREFIX}/${IMAGE}:${TAG} .

cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: kibana-logging
-        image: docker.elastic.co/kibana/kibana-oss:6.6.1
+        image: docker.elastic.co/kibana/kibana-oss:7.1.1
         resources:
           # need more cpu upon initialization, therefore burstable class
           limits: