Commit 5730332b authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #15299 from kevin-wangzefeng/centos_enable_admission_control

Auto commit by PR queue bot
parents 1d3c65c1 74b3250e
...@@ -53,7 +53,7 @@ KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}" ...@@ -53,7 +53,7 @@ KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}"
# LimitRanger, AlwaysDeny, SecurityContextDeny, NamespaceExists, # LimitRanger, AlwaysDeny, SecurityContextDeny, NamespaceExists,
# NamespaceLifecycle, NamespaceAutoProvision, # NamespaceLifecycle, NamespaceAutoProvision,
# AlwaysAdmit, ServiceAccount, ResourceQuota # AlwaysAdmit, ServiceAccount, ResourceQuota
#KUBE_ADMISSION_CONTROL="--admission-control=\"${ADMISSION_CONTROL}\"" KUBE_ADMISSION_CONTROL="--admission-control=${ADMISSION_CONTROL}"
# --client-ca-file="": If set, any request presenting a client certificate signed # --client-ca-file="": If set, any request presenting a client certificate signed
# by one of the authorities in the client-ca-file is authenticated with an identity # by one of the authorities in the client-ca-file is authenticated with an identity
...@@ -78,6 +78,7 @@ KUBE_APISERVER_OPTS=" \${KUBE_LOGTOSTDERR} \\ ...@@ -78,6 +78,7 @@ KUBE_APISERVER_OPTS=" \${KUBE_LOGTOSTDERR} \\
\${MINION_PORT} \\ \${MINION_PORT} \\
\${KUBE_ALLOW_PRIV} \\ \${KUBE_ALLOW_PRIV} \\
\${KUBE_SERVICE_ADDRESSES} \\ \${KUBE_SERVICE_ADDRESSES} \\
\${KUBE_ADMISSION_CONTROL} \\
\${KUBE_API_CLIENT_CA_FILE} \\ \${KUBE_API_CLIENT_CA_FILE} \\
\${KUBE_API_TLS_CERT_FILE} \\ \${KUBE_API_TLS_CERT_FILE} \\
\${KUBE_API_TLS_PRIVATE_KEY_FILE}" \${KUBE_API_TLS_PRIVATE_KEY_FILE}"
......
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