Skip to content

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

Merge pull request #44169 from mikedanese/fix

Automatic merge from submit-queue (batch tested with PRs 42025, 44169, 43940) if we have a dedicated serviceaccount keypair, use it to verify serviceaccounts
parents d7f59296 ffcbe213
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
cluster/gce/gci/configure-helper.sh
View file @ 0653751f
...@@ -1004,6 +1004,9 @@ function start-kube-apiserver { ...@@ -1004,6 +1004,9 @@ function start-kube-apiserver {
params+=" --kubelet-client-certificate=${APISERVER_CLIENT_CERT_PATH}" params+=" --kubelet-client-certificate=${APISERVER_CLIENT_CERT_PATH}"
params+=" --kubelet-client-key=${APISERVER_CLIENT_KEY_PATH}" params+=" --kubelet-client-key=${APISERVER_CLIENT_KEY_PATH}"
fi fi
if [[ -n "${SERVICEACCOUNT_CERT_PATH:-}" ]]; then
params+=" --service-account-key-file=${SERVICEACCOUNT_CERT_PATH}"
fi
params+=" --token-auth-file=/etc/srv/kubernetes/known_tokens.csv" params+=" --token-auth-file=/etc/srv/kubernetes/known_tokens.csv"
if [[ -n "${KUBE_PASSWORD:-}" && -n "${KUBE_USER:-}" ]]; then if [[ -n "${KUBE_PASSWORD:-}" && -n "${KUBE_USER:-}" ]]; then
params+=" --basic-auth-file=/etc/srv/kubernetes/basic_auth.csv" params+=" --basic-auth-file=/etc/srv/kubernetes/basic_auth.csv"
......
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