Skip to content

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

Merge pull request #45604 from shyamjvs/start-km-master-fix

Automatic merge from submit-queue (batch tested with PRs 45569, 45602, 45604, 45478, 45550) Minor bug fix in start-kubemark-master script cc @wojtek-t @gmarek
parents a507d308 1078e958
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
test/kubemark/resources/start-kubemark-master.sh
View file @ e9390199
...@@ -456,7 +456,7 @@ fi ...@@ -456,7 +456,7 @@ fi
mkdir -p "${main_etcd_mount_point}/srv/kubernetes" mkdir -p "${main_etcd_mount_point}/srv/kubernetes"
ln -s -f "${main_etcd_mount_point}/srv/kubernetes" /etc/srv/kubernetes ln -s -f "${main_etcd_mount_point}/srv/kubernetes" /etc/srv/kubernetes
# Copy the files to the PD only if they don't exist (so we do it only the first time). # Copy the files to the PD only if they don't exist (so we do it only the first time).
if [[ "$(ls -A {main_etcd_mount_point}/srv/kubernetes/)" == "" ]]; then if [[ "$(ls -A ${main_etcd_mount_point}/srv/kubernetes/)" == "" ]]; then
cp -r "${KUBE_ROOT}"/k8s_auth_data/* "${main_etcd_mount_point}/srv/kubernetes/" cp -r "${KUBE_ROOT}"/k8s_auth_data/* "${main_etcd_mount_point}/srv/kubernetes/"
fi fi
# Directory for kube-apiserver to store SSH key (if necessary). # Directory for kube-apiserver to store SSH key (if necessary).
......
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