mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #43177 from mml/file-exists!
Automatic merge from submit-queue Force create symlinks. Followup from #43070. Fixes #42660 in a way that does not break etcd upgrades.
This commit is contained in:
commit
47bea96b04
@ -69,7 +69,7 @@ function create-node-pki {
|
||||
|
||||
# TODO(mikedanese): remove this when we don't support downgrading to versions
|
||||
# < 1.6.
|
||||
ln -s "${CA_CERT_BUNDLE_PATH}" /etc/kubernetes/ca.crt
|
||||
ln -sf "${CA_CERT_BUNDLE_PATH}" /etc/kubernetes/ca.crt
|
||||
}
|
||||
|
||||
# A hookpoint for setting up local devices
|
||||
|
@ -219,7 +219,7 @@ function create-node-pki {
|
||||
|
||||
# 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
|
||||
ln -sf "${CA_CERT_BUNDLE_PATH}" /etc/srv/kubernetes/ca.crt
|
||||
}
|
||||
|
||||
function create-master-pki {
|
||||
@ -272,8 +272,8 @@ function create-master-pki {
|
||||
|
||||
# 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
|
||||
ln -sf "${APISERVER_SERVER_CERT_PATH}" /etc/srv/kubernetes/server.key
|
||||
ln -sf "${APISERVER_SERVER_CERT_PATH}" /etc/srv/kubernetes/server.cert
|
||||
}
|
||||
|
||||
# After the first boot and on upgrade, these files exist on the master-pd
|
||||
|
Loading…
Reference in New Issue
Block a user