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

Merge pull request #26238 from ihmccreery/mount-points

Browse Source 
Automatic merge from submit-queue

GCI-backed masters mount srv/kubernetes and srv/sshproxy in the right place

Fixes #26235.

cc @andyzheng0831
This commit is contained in:
k8s-merge-robot 2016-05-25 23:46:08 -07:00
commit bb38265400
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,16 +75,22 @@ function mount-master-pd {
mkdir -p "${mount_point}" mkdir -p "${mount_point}"
/usr/share/google/safe_format_and_mount -m "mkfs.ext4 -F" "${pd_path}" "${mount_point}" &>/var/log/master-pd-mount.log || \ /usr/share/google/safe_format_and_mount -m "mkfs.ext4 -F" "${pd_path}" "${mount_point}" &>/var/log/master-pd-mount.log || \
{ echo "!!! master-pd mount failed, review /var/log/master-pd-mount.log !!!"; return 1; } { echo "!!! master-pd mount failed, review /var/log/master-pd-mount.log !!!"; return 1; }
# NOTE: These locations on the PD store persistent data, so to maintain
# upgradeability, these locations should not change. If they do, take care
# to maintain a migration path from these locations to whatever new
# locations.
# Contains all the data stored in etcd. # Contains all the data stored in etcd.
mkdir -m 700 -p "${mount_point}/var/etcd" mkdir -m 700 -p "${mount_point}/var/etcd"
ln -s -f "${mount_point}/var/etcd" /var/etcd ln -s -f "${mount_point}/var/etcd" /var/etcd
mkdir -p /etc/srv mkdir -p /etc/srv
# Contains the dynamically generated apiserver auth certs and keys. # Contains the dynamically generated apiserver auth certs and keys.
mkdir -p "${mount_point}/etc/srv/kubernetes" mkdir -p "${mount_point}/srv/kubernetes"
ln -s -f "${mount_point}/etc/srv/kubernetes" /etc/srv/kubernetes ln -s -f "${mount_point}/srv/kubernetes" /etc/srv/kubernetes
# Directory for kube-apiserver to store SSH key (if necessary). # Directory for kube-apiserver to store SSH key (if necessary).
mkdir -p "${mount_point}/etc/srv/sshproxy" mkdir -p "${mount_point}/srv/sshproxy"
ln -s -f "${mount_point}/etc/srv/sshproxy" /etc/srv/sshproxy ln -s -f "${mount_point}/srv/sshproxy" /etc/srv/sshproxy
if ! id etcd &>/dev/null; then if ! id etcd &>/dev/null; then
useradd -s /sbin/nologin -d /var/etcd etcd useradd -s /sbin/nologin -d /var/etcd etcd