kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update elasticsearch logging to 5.6.4 

I've picked the versions of everything used by the kubernetes
fluentd-elasticsearch plugin at https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml
This commit is contained in:
Frank Hamand 2018-05-14 16:02:29 +01:00
parent 9691a09abe
commit 0223a327e3
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/logging-elasticsearch/addon.yaml
View File

@ -13,3 +13,8 @@ spec:
k8s-addon: logging-elasticsearch.addons.k8s.io k8s-addon: logging-elasticsearch.addons.k8s.io
manifest: v1.6.0.yaml manifest: v1.6.0.yaml
kubernetesVersion: ">=1.6.0" # RBAC v1beta1 is introduced as of v1.6.0 kubernetesVersion: ">=1.6.0" # RBAC v1beta1 is introduced as of v1.6.0
- version: 1.7.0
selector:
k8s-addon: logging-elasticsearch.addons.k8s.io
manifest: v1.7.0.yaml
kubernetesVersion: ">=1.6.0"

14
addons/logging-elasticsearch/v1.7.0.yaml
View File

@ -101,14 +101,14 @@ metadata:
k8s-addon: logging-elasticsearch.addons.k8s.io k8s-addon: logging-elasticsearch.addons.k8s.io
k8s-app: fluentd-es k8s-app: fluentd-es
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.22 version: v2.0.4
spec: spec:
template: template:
metadata: metadata:
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.22 version: v2.0.4
spec: spec:
serviceAccountName: fluentd-es serviceAccountName: fluentd-es
containers: containers:
@ -185,7 +185,7 @@ spec:
spec: spec:
serviceAccountName: elasticsearch-logging serviceAccountName: elasticsearch-logging
containers: containers:
- image: k8s.gcr.io/elasticsearch:v2.4.1-2 - image: k8s.gcr.io/elasticsearch:v5.6.4
name: elasticsearch-logging name: elasticsearch-logging
resources: resources:
# need more cpu upon initialization, therefore burstable class # need more cpu upon initialization, therefore burstable class
@ -242,7 +242,7 @@ spec:
spec: spec:
containers: containers:
- name: kibana-logging - name: kibana-logging
image: k8s.gcr.io/kibana:v4.6.1-1 image: docker.elastic.co/kibana/kibana:5.6.4
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
@ -252,8 +252,12 @@ spec:
env: env:
- name: "ELASTICSEARCH_URL" - name: "ELASTICSEARCH_URL"
value: "http://elasticsearch-logging:9200" value: "http://elasticsearch-logging:9200"
- name: "KIBANA_BASE_URL" - name: "SERVER_BASEPATH"
value: "/api/v1/proxy/namespaces/kube-system/services/kibana-logging" value: "/api/v1/proxy/namespaces/kube-system/services/kibana-logging"
- name: "XPACK_MONITORING_ENABLED"
value: "false"
- name: "XPACK_SECURITY_ENABLED"
value: "false"
ports: ports:
- containerPort: 5601 - containerPort: 5601
name: ui name: ui