From 1f6647d3cd8859d8bafd63c26cb51f82181cb7da Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Sun, 1 Oct 2017 12:00:08 +0200 Subject: [PATCH 1/2] fluentd-elasticsearch add-on: Upgrade to Elasticsearch/Kibana 5.6.2 --- cluster/addons/fluentd-elasticsearch/es-image/Dockerfile | 2 +- cluster/addons/fluentd-elasticsearch/es-image/Makefile | 2 +- cluster/addons/fluentd-elasticsearch/es-statefulset.yaml | 8 ++++---- .../addons/fluentd-elasticsearch/kibana-deployment.yaml | 2 +- 4 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 28e3c96d3d3..2e9d5b3f07e 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.elastic.co/elasticsearch/elasticsearch:5.5.1 +FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.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 32d2c46ddf5..3787505c7e0 100755 --- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile @@ -16,7 +16,7 @@ PREFIX = gcr.io/google-containers IMAGE = elasticsearch -TAG = v5.5.1-1 +TAG = v5.6.2-1 build: docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml index 5bafaf83c47..5234d411c22 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: v5.5.1 + version: v5.6.2 kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile spec: @@ -63,17 +63,17 @@ spec: selector: matchLabels: k8s-app: elasticsearch-logging - version: v5.5.1 + version: v5.6.2 template: metadata: labels: k8s-app: elasticsearch-logging - version: v5.5.1 + version: v5.6.2 kubernetes.io/cluster-service: "true" spec: serviceAccountName: elasticsearch-logging containers: - - image: gcr.io/google-containers/elasticsearch:v5.5.1-1 + - image: gcr.io/google-containers/elasticsearch:v5.6.2-1 name: elasticsearch-logging resources: # need more cpu upon initialization, therefore burstable class diff --git a/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml b/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml index 4aabf38ae14..d20eeac60e9 100644 --- a/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml +++ b/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: kibana-logging - image: docker.elastic.co/kibana/kibana:5.5.1 + image: docker.elastic.co/kibana/kibana:5.6.2 resources: # need more cpu upon initialization, therefore burstable class limits: From 64fcdf04c4b1331c2b7fab28d5b5ef5b5f18b559 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Sun, 1 Oct 2017 12:25:31 +0200 Subject: [PATCH 2/2] fluentd-elasticsearch add-on: Upgrade API versions --- cluster/addons/fluentd-elasticsearch/es-statefulset.yaml | 2 +- cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 2 +- cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml index 5234d411c22..85f7cb19e0c 100644 --- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml @@ -47,7 +47,7 @@ roleRef: apiGroup: "" --- # Elasticsearch deployment itself -apiVersion: apps/v1beta1 +apiVersion: apps/v1beta2 kind: StatefulSet metadata: name: elasticsearch-logging diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index ae58d601800..cb14b33e32c 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -45,7 +45,7 @@ roleRef: name: fluentd-es apiGroup: "" --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta2 kind: DaemonSet metadata: name: fluentd-es-v2.0.1 diff --git a/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml b/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml index d20eeac60e9..525fd9f4e5f 100644 --- a/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml +++ b/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta2 kind: Deployment metadata: name: kibana-logging