mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-26 19:35:10 +00:00
fea9a3f1c5
Automatic merge from submit-queue (batch tested with PRs 64142, 64426, 62910, 63942, 64548). 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>. update fluentd-elasticsearch addon **What this PR does / why we need it**: Elastic now provides a fully opensource version for their prebuild docker images (elasticsearch, kibana and so on). To avoid running into licensing conflicts for this addon example, we should rather use these images instead of the premium ones (were we also have to disable premium features manually right now). This PR updates: - fluentd from <=1.1.0 to ~>1.1.3 - elasticsearch and kibana from 5.6.2 to 6.2.4 - fluentd-elasticsearch-plugin from 2.4.1 to 2.9.1 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # https://github.com/fluent/fluentd/issues/1894 **Special notes for your reviewer**: **Release note**: ```release-note ```
40 lines
1.0 KiB
YAML
40 lines
1.0 KiB
YAML
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
name: kibana-logging
|
|
namespace: kube-system
|
|
labels:
|
|
k8s-app: kibana-logging
|
|
kubernetes.io/cluster-service: "true"
|
|
addonmanager.kubernetes.io/mode: Reconcile
|
|
spec:
|
|
replicas: 1
|
|
selector:
|
|
matchLabels:
|
|
k8s-app: kibana-logging
|
|
template:
|
|
metadata:
|
|
labels:
|
|
k8s-app: kibana-logging
|
|
annotations:
|
|
seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
|
|
spec:
|
|
containers:
|
|
- name: kibana-logging
|
|
image: docker.elastic.co/kibana/kibana-oss:6.2.4
|
|
resources:
|
|
# need more cpu upon initialization, therefore burstable class
|
|
limits:
|
|
cpu: 1000m
|
|
requests:
|
|
cpu: 100m
|
|
env:
|
|
- name: ELASTICSEARCH_URL
|
|
value: http://elasticsearch-logging:9200
|
|
- name: SERVER_BASEPATH
|
|
value: /api/v1/namespaces/kube-system/services/kibana-logging/proxy
|
|
ports:
|
|
- containerPort: 5601
|
|
name: ui
|
|
protocol: TCP
|