correct some indentation issues in the fluentd daemonset.
This commit is contained in:
parent
c75da43f22
commit
cd7c58e8d3
3 changed files with 14 additions and 11 deletions
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.10/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
|
# https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.2/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -7,8 +7,8 @@ metadata:
|
||||||
namespace: "kube-system"
|
namespace: "kube-system"
|
||||||
labels:
|
labels:
|
||||||
k8s-app: fluentd-es
|
k8s-app: fluentd-es
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
version: "{{ fluentd_version }}"
|
version: "{{ fluentd_version }}"
|
||||||
|
kubernetes.io/cluster-service: "true"
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
|
@ -26,6 +26,11 @@ spec:
|
||||||
# Note that this does not guarantee admission on the nodes (#40573).
|
# Note that this does not guarantee admission on the nodes (#40573).
|
||||||
annotations:
|
annotations:
|
||||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||||
|
spec:
|
||||||
|
priorityClassName: system-node-critical
|
||||||
|
{% if rbac_enabled %}
|
||||||
|
serviceAccountName: efk
|
||||||
|
{% endif %}
|
||||||
containers:
|
containers:
|
||||||
- name: fluentd-es
|
- name: fluentd-es
|
||||||
image: "{{ fluentd_image_repo }}:{{ fluentd_image_tag }}"
|
image: "{{ fluentd_image_repo }}:{{ fluentd_image_tag }}"
|
||||||
|
@ -44,7 +49,7 @@ spec:
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: varlog
|
- name: varlog
|
||||||
mountPath: /var/log
|
mountPath: /var/log
|
||||||
- name: dockercontainers
|
- name: varlibdockercontainers
|
||||||
mountPath: "{{ docker_daemon_graph }}/containers"
|
mountPath: "{{ docker_daemon_graph }}/containers"
|
||||||
readOnly: true
|
readOnly: true
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
|
@ -56,12 +61,9 @@ spec:
|
||||||
- name: varlog
|
- name: varlog
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /var/log
|
path: /var/log
|
||||||
- name: dockercontainers
|
- name: varlibdockercontainers
|
||||||
hostPath:
|
hostPath:
|
||||||
path: {{ docker_daemon_graph }}/containers
|
path: {{ docker_daemon_graph }}/containers
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
configMap:
|
configMap:
|
||||||
name: fluentd-config
|
name: fluentd-config
|
||||||
{% if rbac_enabled %}
|
|
||||||
serviceAccountName: efk
|
|
||||||
{% endif %}
|
|
||||||
|
|
|
@ -4,3 +4,4 @@ kibana_mem_limit: 0M
|
||||||
kibana_cpu_requests: 100m
|
kibana_cpu_requests: 100m
|
||||||
kibana_mem_requests: 0M
|
kibana_mem_requests: 0M
|
||||||
kibana_service_port: 5601
|
kibana_service_port: 5601
|
||||||
|
kibana_base_url: "/api/v1/namespaces/kube-system/services/kibana-logging/proxy"
|
||||||
|
|
|
@ -37,7 +37,7 @@ spec:
|
||||||
- name: "ELASTICSEARCH_URL"
|
- name: "ELASTICSEARCH_URL"
|
||||||
value: "http://elasticsearch-logging:{{ elasticsearch_service_port }}"
|
value: "http://elasticsearch-logging:{{ elasticsearch_service_port }}"
|
||||||
- name: "SERVER_BASEPATH"
|
- name: "SERVER_BASEPATH"
|
||||||
value: "/api/v1/namespaces/kube-system/services/kibana-logging/proxy"
|
value: "{{ kibana_base_url }}"
|
||||||
- name: XPACK_MONITORING_ENABLED
|
- name: XPACK_MONITORING_ENABLED
|
||||||
value: "false"
|
value: "false"
|
||||||
- name: XPACK_SECURITY_ENABLED
|
- name: XPACK_SECURITY_ENABLED
|
||||||
|
|
Loading…
Reference in a new issue