From 52ab54eeea02196c77179a562bd4a9364def0e12 Mon Sep 17 00:00:00 2001
From: Erwan Miran <mirwan666@gmail.com>
Date: Tue, 28 Aug 2018 09:00:41 +0200
Subject: [PATCH] Fix missing quotes for audit-log-path and wrong placement of
feature-gates
---
.../master/templates/kubeadm-config.v1alpha2.yaml.j2 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
index 31c499e0f..cc1d9e3e0 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
@@ -82,12 +82,15 @@ apiServerExtraArgs:
{% endif %}
allow-privileged: "true"
{% if kubernetes_audit %}
- audit-log-path: {{ audit_log_path }}
+ audit-log-path: "{{ audit_log_path }}"
audit-log-maxage: "{{ audit_log_maxage }}"
audit-log-maxbackup: "{{ audit_log_maxbackups }}"
audit-log-maxsize: "{{ audit_log_maxsize }}"
audit-policy-file: {{ audit_policy_file }}
{% endif %}
+{% if kube_feature_gates %}
+ feature-gates: {{ kube_feature_gates|join(',') }}
+{% endif %}
{% for key in kube_kubeadm_apiserver_extra_args %}
{{ key }}: "{{ kube_kubeadm_apiserver_extra_args[key] }}"
{% endfor %}
@@ -113,9 +116,6 @@ apiServerExtraVolumes:
writable: true
{% endif %}
{% endif %}
-{% if kube_feature_gates %}
- feature-gates: {{ kube_feature_gates|join(',') }}
-{% endif %}
{% for key in kube_kubeadm_controller_extra_args %}
{{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}"
{% endfor %}
--
GitLab