mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 09:22:44 +00:00
update local-up-cluster to allow full authentication proxying
This commit is contained in:
parent
55f13b5729
commit
fdb0b2bca2
@ -58,7 +58,6 @@ FEATURE_GATES=${FEATURE_GATES:-"AllAlpha=true"}
|
|||||||
|
|
||||||
# RBAC Mode options
|
# RBAC Mode options
|
||||||
ALLOW_ANY_TOKEN=${ALLOW_ANY_TOKEN:-false}
|
ALLOW_ANY_TOKEN=${ALLOW_ANY_TOKEN:-false}
|
||||||
ENABLE_AUTH_PROXY=${ENABLE_AUTH_PROXY:-false}
|
|
||||||
ENABLE_RBAC=${ENABLE_RBAC:-false}
|
ENABLE_RBAC=${ENABLE_RBAC:-false}
|
||||||
KUBECONFIG_TOKEN=${KUBECONFIG_TOKEN:-""}
|
KUBECONFIG_TOKEN=${KUBECONFIG_TOKEN:-""}
|
||||||
AUTH_ARGS=${AUTH_ARGS:-""}
|
AUTH_ARGS=${AUTH_ARGS:-""}
|
||||||
@ -406,12 +405,6 @@ function start_apiserver {
|
|||||||
anytoken_arg="--insecure-allow-any-token "
|
anytoken_arg="--insecure-allow-any-token "
|
||||||
KUBECONFIG_TOKEN=${KUBECONFIG_TOKEN:-"system:admin/system:masters"}
|
KUBECONFIG_TOKEN=${KUBECONFIG_TOKEN:-"system:admin/system:masters"}
|
||||||
fi
|
fi
|
||||||
auth_proxy_arg=""
|
|
||||||
if [[ "${ENABLE_AUTH_PROXY}" = true ]]; then
|
|
||||||
auth_proxy_arg="--requestheader-username-headers=X-Remote-User \
|
|
||||||
--requestheader-client-ca-file=${CERT_DIR}/auth-proxy-client-ca.crt \
|
|
||||||
--requestheader-allowed-names=system:auth-proxy "
|
|
||||||
fi
|
|
||||||
authorizer_arg=""
|
authorizer_arg=""
|
||||||
if [[ "${ENABLE_RBAC}" = true ]]; then
|
if [[ "${ENABLE_RBAC}" = true ]]; then
|
||||||
authorizer_arg="--authorization-mode=RBAC "
|
authorizer_arg="--authorization-mode=RBAC "
|
||||||
@ -458,7 +451,7 @@ EOF
|
|||||||
sudo bash -c "cat '${CERT_DIR}/client-ca.crt' '${CERT_DIR}/auth-proxy-client-ca.crt' > '${CERT_DIR}/client-ca-bundle.crt'"
|
sudo bash -c "cat '${CERT_DIR}/client-ca.crt' '${CERT_DIR}/auth-proxy-client-ca.crt' > '${CERT_DIR}/client-ca-bundle.crt'"
|
||||||
|
|
||||||
APISERVER_LOG=/tmp/kube-apiserver.log
|
APISERVER_LOG=/tmp/kube-apiserver.log
|
||||||
${CONTROLPLANE_SUDO} "${GO_OUT}/hyperkube" apiserver ${anytoken_arg} ${auth_proxy_arg} ${authorizer_arg} ${priv_arg} ${runtime_config}\
|
${CONTROLPLANE_SUDO} "${GO_OUT}/hyperkube" apiserver ${anytoken_arg} ${authorizer_arg} ${priv_arg} ${runtime_config}\
|
||||||
${advertise_address} \
|
${advertise_address} \
|
||||||
--v=${LOG_LEVEL} \
|
--v=${LOG_LEVEL} \
|
||||||
--cert-dir="${CERT_DIR}" \
|
--cert-dir="${CERT_DIR}" \
|
||||||
@ -476,6 +469,11 @@ EOF
|
|||||||
--feature-gates="${FEATURE_GATES}" \
|
--feature-gates="${FEATURE_GATES}" \
|
||||||
--cloud-provider="${CLOUD_PROVIDER}" \
|
--cloud-provider="${CLOUD_PROVIDER}" \
|
||||||
--cloud-config="${CLOUD_CONFIG}" \
|
--cloud-config="${CLOUD_CONFIG}" \
|
||||||
|
--requestheader-username-headers=X-Remote-User \
|
||||||
|
--requestheader-group-headers=X-Remote-Group \
|
||||||
|
--requestheader-extra-headers-prefix=X-Remote-Extra- \
|
||||||
|
--requestheader-client-ca-file=${CERT_DIR}/auth-proxy-client-ca.crt \
|
||||||
|
--requestheader-allowed-names=system:auth-proxy \
|
||||||
--cors-allowed-origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 &
|
--cors-allowed-origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 &
|
||||||
APISERVER_PID=$!
|
APISERVER_PID=$!
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user