github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 12:17:52 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request #41132 from kubernetes/revert-40893-kubelet-auth"

Browse Source 
This reverts commit fd56078298, reversing
changes made to d953402cdf.
This commit is contained in:
Mike Danese
2017-02-09 10:37:30 -08:00
parent 2e005f5ace
commit c8ce55fef4
9 changed files with 61 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/upgrade.sh
View File

@@ -233,9 +233,6 @@ function prepare-node-upgrade() {
KUBELET_CERT_BASE64=$(get-env-val "${node_env}" "KUBELET_CERT")
KUBELET_KEY_BASE64=$(get-env-val "${node_env}" "KUBELET_KEY")
local master_env=$(get-master-env)
KUBELET_AUTH_CA_CERT_BASE64=$(get-env-val "${master_env}" "KUBELET_AUTH_CA_CERT")
# TODO(zmerlynn): How do we ensure kube-env is written in a ${version}-
# compatible way?
write-node-env