Browse Source
Merge pull request #3187 from mirwan/kubeadm-config_syntax
Fix kubeadm-config for audit-log-path and feature-gates
pull/2761/merge
k8s-ci-robot
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
4 deletions
-
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
|
|
@ -83,12 +83,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 %} |
|
|
@ -114,9 +117,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 %} |
|
|
|