Merge pull request #53307 from aknuds1/upgrade-elasticsearch-to-5.6.2

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Upgrade fluentd-elasticsearch addon to Elasticsearch/Kibana 5.6.2

Upgrade Elasticsearch and Kibana to version 5.6.2. I also upgrade some API versions of manifests to correspond to Kubernetes 1.8, I hope the latter is uncontroversial?

```release-notes
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-02 17:25:28 -07:00 committed by GitHub
commit 0ac7cb0c60
5 changed files with 10 additions and 10 deletions

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM docker.elastic.co/elasticsearch/elasticsearch:5.5.1 FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.2
VOLUME ["/data"] VOLUME ["/data"]
EXPOSE 9200 9300 EXPOSE 9200 9300

View File

@ -16,7 +16,7 @@
PREFIX = gcr.io/google-containers PREFIX = gcr.io/google-containers
IMAGE = elasticsearch IMAGE = elasticsearch
TAG = v5.5.1-1 TAG = v5.6.2-1
build: build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .

View File

@ -47,14 +47,14 @@ roleRef:
apiGroup: "" apiGroup: ""
--- ---
# Elasticsearch deployment itself # Elasticsearch deployment itself
apiVersion: apps/v1beta1 apiVersion: apps/v1beta2
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: elasticsearch-logging name: elasticsearch-logging
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v5.5.1 version: v5.6.2
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
@ -63,17 +63,17 @@ spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v5.5.1 version: v5.6.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v5.5.1 version: v5.6.2
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
serviceAccountName: elasticsearch-logging serviceAccountName: elasticsearch-logging
containers: containers:
- image: gcr.io/google-containers/elasticsearch:v5.5.1-1 - image: gcr.io/google-containers/elasticsearch:v5.6.2-1
name: elasticsearch-logging name: elasticsearch-logging
resources: resources:
# need more cpu upon initialization, therefore burstable class # need more cpu upon initialization, therefore burstable class

View File

@ -45,7 +45,7 @@ roleRef:
name: fluentd-es name: fluentd-es
apiGroup: "" apiGroup: ""
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1beta2
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-es-v2.0.1 name: fluentd-es-v2.0.1

View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1 apiVersion: apps/v1beta2
kind: Deployment kind: Deployment
metadata: metadata:
name: kibana-logging name: kibana-logging
@ -19,7 +19,7 @@ spec:
spec: spec:
containers: containers:
- name: kibana-logging - name: kibana-logging
image: docker.elastic.co/kibana/kibana:5.5.1 image: docker.elastic.co/kibana/kibana:5.6.2
resources: resources:
# need more cpu upon initialization, therefore burstable class # need more cpu upon initialization, therefore burstable class
limits: limits: