correct some indentation issues in the fluentd daemonset.

roles/kubernetes-apps/efk/fluentd/templates/fluentd-ds.yml.j2

@@ -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
 kind: DaemonSet
 metadata:
@@ -7,8 +7,8 @@ metadata:
   namespace: "kube-system"
   labels:
     k8s-app: fluentd-es
-    kubernetes.io/cluster-service: "true"
     version: "{{ fluentd_version }}"
+    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   selector:
@@ -26,6 +26,11 @@ spec:
       # Note that this does not guarantee admission on the nodes (#40573).
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
+    spec:
+      priorityClassName: system-node-critical
+{% if rbac_enabled %}
+      serviceAccountName: efk
+{% endif %}
       containers:
       - name: fluentd-es
         image: "{{ fluentd_image_repo }}:{{ fluentd_image_tag }}"
@@ -39,12 +44,12 @@ spec:
 {% endif %}
             memory: {{ fluentd_mem_limit }}
           requests:
-            cpu:  {{ fluentd_cpu_requests }}
+            cpu: {{ fluentd_cpu_requests }}
             memory: {{ fluentd_mem_requests }}
         volumeMounts:
         - name: varlog
           mountPath: /var/log
-        - name: dockercontainers
+        - name: varlibdockercontainers
           mountPath: "{{ docker_daemon_graph }}/containers"
           readOnly: true
         - name: config-volume
@@ -56,12 +61,9 @@ spec:
       - name: varlog
         hostPath:
           path: /var/log
-      - name: dockercontainers
+      - name: varlibdockercontainers
         hostPath:
           path: {{ docker_daemon_graph }}/containers
       - name: config-volume
         configMap:
           name: fluentd-config
-{% if rbac_enabled %}
-      serviceAccountName: efk 
-{% endif %}

roles/kubernetes-apps/efk/kibana/defaults/main.yml

@@ -4,3 +4,4 @@ kibana_mem_limit: 0M
 kibana_cpu_requests: 100m
 kibana_mem_requests: 0M
 kibana_service_port: 5601
+kibana_base_url: "/api/v1/namespaces/kube-system/services/kibana-logging/proxy"

roles/kubernetes-apps/efk/kibana/templates/kibana-deployment.yml.j2

@@ -37,7 +37,7 @@ spec:
           - name: "ELASTICSEARCH_URL"
             value: "http://elasticsearch-logging:{{ elasticsearch_service_port }}"
           - name: "SERVER_BASEPATH"
-            value: "/api/v1/namespaces/kube-system/services/kibana-logging/proxy"
+            value: "{{ kibana_base_url }}"
           - name: XPACK_MONITORING_ENABLED
             value: "false"
           - name: XPACK_SECURITY_ENABLED