From 54548d3b950d055617a2ec8338f2376de0b53d90 Mon Sep 17 00:00:00 2001
From: Erwan Miran <mirwan666@gmail.com>
Date: Thu, 16 Aug 2018 13:17:30 +0200
Subject: [PATCH] kubeadm mounts the hostpaths itself
---
.../master/templates/kubeadm-config.v1alpha2.yaml.j2 | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
index 07ce9145d..9a72fde75 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
@@ -14,7 +14,7 @@ etcd:
keyFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}-key.pem
{% if kubernetes_audit %}
auditPolicy:
- logDir: {{ audit_log_mountpath }}
+ logDir: {{ audit_log_hostpath }}
logMaxAge: {{ audit_log_maxage }}
path: {{ audit_policy_file }}
{% endif %}
@@ -88,15 +88,6 @@ controllerManagerExtraArgs:
node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }}
node-monitor-period: {{ kube_controller_node_monitor_period }}
pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }}
-{% if kubernetes_audit %}
-apiServerExtraVolumes:
-- name: {{ audit_policy_name }}
- hostPath: {{ audit_policy_hostpath }}
- mountPath: {{ audit_policy_mountpath }}
-- name: {{ audit_log_name }}
- hostPath: {{ audit_log_hostpath }}
- mountPath: {{ audit_log_mountpath }}
-{% endif %}
{% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined %}
controllerManagerExtraVolumes:
- name: openstackcacert
--
GitLab