Skip to content

K
k3s
Unverified Commit b5ba7a2c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #67705 from x13n/bugfix

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Set --audit-webhook-mode flag properly based on the env variable **What this PR does / why we need it**: Audit webhook mode control via env variable is currently broken and this is the fix. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents f15fe933 c4434855
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cluster/gce/gci/configure-helper.sh
View file @ b5ba7a2c
...@@ -1593,8 +1593,6 @@ function start-kube-apiserver { ...@@ -1593,8 +1593,6 @@ function start-kube-apiserver {
fi fi
fi fi
if [[ "${ADVANCED_AUDIT_BACKEND:-}" == *"webhook"* ]]; then if [[ "${ADVANCED_AUDIT_BACKEND:-}" == *"webhook"* ]]; then
params+=" --audit-webhook-mode=batch"
# Create the audit webhook config file, and mount it into the apiserver pod. # Create the audit webhook config file, and mount it into the apiserver pod.
local -r audit_webhook_config_file="/etc/audit_webhook.config" local -r audit_webhook_config_file="/etc/audit_webhook.config"
params+=" --audit-webhook-config-file=${audit_webhook_config_file}" params+=" --audit-webhook-config-file=${audit_webhook_config_file}"
...@@ -1605,6 +1603,8 @@ function start-kube-apiserver { ...@@ -1605,6 +1603,8 @@ function start-kube-apiserver {
# Batching parameters # Batching parameters
if [[ -n "${ADVANCED_AUDIT_WEBHOOK_MODE:-}" ]]; then if [[ -n "${ADVANCED_AUDIT_WEBHOOK_MODE:-}" ]]; then
params+=" --audit-webhook-mode=${ADVANCED_AUDIT_WEBHOOK_MODE}" params+=" --audit-webhook-mode=${ADVANCED_AUDIT_WEBHOOK_MODE}"
else
params+=" --audit-webhook-mode=batch"
fi fi
if [[ -n "${ADVANCED_AUDIT_WEBHOOK_BUFFER_SIZE:-}" ]]; then if [[ -n "${ADVANCED_AUDIT_WEBHOOK_BUFFER_SIZE:-}" ]]; then
params+=" --audit-webhook-batch-buffer-size=${ADVANCED_AUDIT_WEBHOOK_BUFFER_SIZE}" params+=" --audit-webhook-batch-buffer-size=${ADVANCED_AUDIT_WEBHOOK_BUFFER_SIZE}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment