Skip to content

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

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.
parents b1cac347 c79d74f3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cluster/gce/configure-vm.sh
View file @ 47bea96b
...@@ -69,7 +69,7 @@ function create-node-pki { ...@@ -69,7 +69,7 @@ function create-node-pki {
# TODO(mikedanese): remove this when we don't support downgrading to versions # TODO(mikedanese): remove this when we don't support downgrading to versions
# < 1.6. # < 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 # A hookpoint for setting up local devices
......
cluster/gce/gci/configure-helper.sh
View file @ 47bea96b
...@@ -219,7 +219,7 @@ function create-node-pki { ...@@ -219,7 +219,7 @@ function create-node-pki {
# TODO(mikedanese): remove this when we don't support downgrading to versions # TODO(mikedanese): remove this when we don't support downgrading to versions
# < 1.6. # < 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 { function create-master-pki {
...@@ -272,8 +272,8 @@ function create-master-pki { ...@@ -272,8 +272,8 @@ function create-master-pki {
# TODO(mikedanese): remove this when we don't support downgrading to versions # TODO(mikedanese): remove this when we don't support downgrading to versions
# < 1.6. # < 1.6.
ln -s "${APISERVER_SERVER_CERT_PATH}" /etc/srv/kubernetes/server.key ln -sf "${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.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
......
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