From 0c97dc8ba08881531ae220203f95322138d78dd2 Mon Sep 17 00:00:00 2001
From: zhanghailong-qingcloud
 <79838597+zhanghailong-qingcloud@users.noreply.github.com>
Date: Mon, 19 Apr 2021 18:13:29 +0800
Subject: [PATCH] Kubeedge (#408)

* audit-webhook

* audit-webhook

* audit-webhook

* Delete 05.kubeadm.conf.tmpl

* 05
---
 .../files/etc/confd/templates/kube.sh/05.kubeadm.conf.tmpl     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ansible/roles/app-role-k8s/files/etc/confd/templates/kube.sh/05.kubeadm.conf.tmpl b/ansible/roles/app-role-k8s/files/etc/confd/templates/kube.sh/05.kubeadm.conf.tmpl
index 56e86859..381f0f8e 100644
--- a/ansible/roles/app-role-k8s/files/etc/confd/templates/kube.sh/05.kubeadm.conf.tmpl
+++ b/ansible/roles/app-role-k8s/files/etc/confd/templates/kube.sh/05.kubeadm.conf.tmpl
@@ -34,15 +34,12 @@ apiServer:
     advertise-address: 0.0.0.0
     {{- if $kubeAuditPolicy }}
     audit-policy-file: $KUBE_AUDIT_POLICY_RUNTIME_FILE
-    {{- if $kubeAuditWebhook }}
     audit-webhook-config-file: $KUBE_AUDIT_WEBHOOK_RUNTIME_FILE
-    {{- else }}
     audit-log-maxage: "{{ getv "/env/keep_audit_days" }}"
     audit-log-path: /etc/kubernetes/audit/logs/audit.log
     audit-log-maxsize: "{{ getv "/env/kube_audit_log_maxsize" "1" }}"
     audit-log-maxbackup: "{{ getv "/env/kube_audit_log_maxbackup" "100" }}"
     {{- end }}
-    {{- end }}
     etcd-prefix: {{ getv "/cluster/cluster_id" }}
     v: "{{ getv "/env/kube_log_level" }}"
     {{ replace (replace (join (getvs "/env/apiserver.params") "") "\r" "" -1) "\n" "\n    " -1 }}