github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43070 from mikedanese/downfix

Browse Source 
Automatic merge from submit-queue

add a compatibility shim for certs to support a cluster downgrade

Fixes https://github.com/kubernetes/kubernetes/issues/42660
This commit is contained in:
Kubernetes Submit Queue 2017-03-15 05:16:27 -07:00 committed by GitHub
commit 6e05e1c50a
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/configure-vm.sh
View File

@ -66,6 +66,10 @@ function create-node-pki {
KUBELET_KEY_PATH="${pki_dir}/kubelet.key" KUBELET_KEY_PATH="${pki_dir}/kubelet.key"
echo "${KUBELET_KEY}" | base64 --decode > "${KUBELET_KEY_PATH}" echo "${KUBELET_KEY}" | base64 --decode > "${KUBELET_KEY_PATH}"
fi fi
# TODO(mikedanese): remove this when we don't support downgrading to versions
# < 1.6.
ln -s "${CA_CERT_BUNDLE_PATH}" /etc/kubernetes/ca.crt
} }
# A hookpoint for setting up local devices # A hookpoint for setting up local devices

9
cluster/gce/gci/configure-helper.sh
View File

@ -216,6 +216,10 @@ function create-node-pki {
KUBELET_KEY_PATH="${pki_dir}/kubelet.key" KUBELET_KEY_PATH="${pki_dir}/kubelet.key"
echo "${KUBELET_KEY}" | base64 --decode > "${KUBELET_KEY_PATH}" echo "${KUBELET_KEY}" | base64 --decode > "${KUBELET_KEY_PATH}"
fi fi
# TODO(mikedanese): remove this when we don't support downgrading to versions
# < 1.6.
ln -s "${CA_CERT_BUNDLE_PATH}" /etc/srv/kubernetes/ca.crt
} }
function create-master-pki { function create-master-pki {
@ -265,6 +269,11 @@ function create-master-pki {
SERVICEACCOUNT_KEY_PATH="${pki_dir}/serviceaccount.key" SERVICEACCOUNT_KEY_PATH="${pki_dir}/serviceaccount.key"
echo "${SERVICEACCOUNT_KEY}" | base64 --decode > "${SERVICEACCOUNT_KEY_PATH}" echo "${SERVICEACCOUNT_KEY}" | base64 --decode > "${SERVICEACCOUNT_KEY_PATH}"
# TODO(mikedanese): remove this when we don't support downgrading to versions
# < 1.6.
ln -s "${APISERVER_SERVER_CERT_PATH}" /etc/srv/kubernetes/server.key
ln -s "${APISERVER_SERVER_CERT_PATH}" /etc/srv/kubernetes/server.cert
} }
# After the first boot and on upgrade, these files exist on the master-pd # After the first boot and on upgrade, these files exist on the master-pd