From daa3065a7ea6b9f7febb5ea483b5b2716a888203 Mon Sep 17 00:00:00 2001 From: Pat Christopher Date: Thu, 7 Nov 2019 11:29:58 -0600 Subject: [PATCH] update to version 7.3.2 --- .../addons/fluentd-elasticsearch/es-image/Dockerfile | 2 +- cluster/addons/fluentd-elasticsearch/es-image/Makefile | 2 +- .../addons/fluentd-elasticsearch/es-statefulset.yaml | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile index 50ce9fabf39..d143bee9241 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:7.2.0 +FROM docker.elastic.co/elasticsearch/elasticsearch-oss:7.3.2 VOLUME ["/data"] EXPOSE 9200 9300 diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile index ca420cd7cab..d421ce97f00 100755 --- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile @@ -16,7 +16,7 @@ PREFIX = quay.io/fluentd_elasticsearch IMAGE = elasticsearch -TAG = v7.2.0 +TAG = v7.3.2 build: docker build --tag ${PREFIX}/${IMAGE}:${TAG} . diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml index 8142b0c4a4b..a43ce806e26 100644 --- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml @@ -51,7 +51,7 @@ metadata: namespace: kube-system labels: k8s-app: elasticsearch-logging - version: v7.2.0 + version: v7.3.2 addonmanager.kubernetes.io/mode: Reconcile spec: serviceName: elasticsearch-logging @@ -59,24 +59,26 @@ spec: selector: matchLabels: k8s-app: elasticsearch-logging - version: v7.2.0 + version: v7.3.2 template: metadata: labels: k8s-app: elasticsearch-logging - version: v7.2.0 + version: v7.3.2 spec: serviceAccountName: elasticsearch-logging containers: - - image: quay.io/fluentd_elasticsearch/elasticsearch:v7.2.0 + - image: quay.io/fluentd_elasticsearch/elasticsearch:v7.3.2 name: elasticsearch-logging imagePullPolicy: Always resources: # need more cpu upon initialization, therefore burstable class limits: cpu: 1000m + memory: 3Gi requests: cpu: 100m + memory: 3Gi ports: - containerPort: 9200 name: db