github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 05:21:58 +00:00
Code Issues Projects Releases Wiki Activity

AWS: Mount ephemeral on /mnt/ephemeral

Browse Source 
If we're going to have a persistent disk on /mnt/master-pd, it seems risky
sometimes to have /mnt be a mounted volume.

A new consistent approach: we mount volumes under /mnt/<name>.
This commit is contained in:
Justin Santa Barbara 2015-06-25 15:42:32 -04:00
parent 7059f379a4
commit 0a4f03f235
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cluster/aws/templates/format-disks.sh
View File

@ -66,6 +66,7 @@ else
# Remove any existing mounts # Remove any existing mounts
for block_device in ${block_devices}; do for block_device in ${block_devices}; do
echo "Unmounting ${block_device}"
/bin/umount ${block_device} /bin/umount ${block_device}
sed -i -e "\|^${block_device}|d" /etc/fstab sed -i -e "\|^${block_device}|d" /etc/fstab
done done
@ -80,26 +81,28 @@ else
echo "Found multiple ephemeral block devices, formatting with btrfs as RAID-0" echo "Found multiple ephemeral block devices, formatting with btrfs as RAID-0"
mkfs.btrfs -f --data raid0 ${block_devices[@]} mkfs.btrfs -f --data raid0 ${block_devices[@]}
fi fi
echo "${block_devices[0]} /mnt btrfs noatime 0 0" >> /etc/fstab echo "${block_devices[0]} /mnt/ephemeral btrfs noatime 0 0" >> /etc/fstab
mount /mnt mkdir -p /mnt/ephemeral
mount /mnt/ephemeral
mkdir -p /mnt/kubernetes mkdir -p /mnt/ephemeral/kubernetes
move_docker="/mnt" move_docker="/mnt/ephemeral"
move_kubelet="/mnt/kubernetes" move_kubelet="/mnt/ephemeral/kubernetes"
elif [[ ${docker_storage} == "aufs-nolvm" ]]; then elif [[ ${docker_storage} == "aufs-nolvm" ]]; then
if [[ ${#block_devices[@]} != 1 ]]; then if [[ ${#block_devices[@]} != 1 ]]; then
echo "aufs-nolvm selected, but multiple ephemeral devices were found; only the first will be available" echo "aufs-nolvm selected, but multiple ephemeral devices were found; only the first will be available"
fi fi
mkfs -t ext4 ${block_devices[0]} mkfs -t ext4 ${block_devices[0]}
echo "${block_devices[0]} /mnt ext4 noatime 0 0" >> /etc/fstab echo "${block_devices[0]} /mnt/ephemeral ext4 noatime 0 0" >> /etc/fstab
mount /mnt mkdir -p /mnt/ephemeral
mount /mnt/ephemeral
mkdir -p /mnt/kubernetes mkdir -p /mnt/ephemeral/kubernetes
move_docker="/mnt" move_docker="/mnt/ephemeral"
move_kubelet="/mnt/kubernetes" move_kubelet="/mnt/ephemeral/kubernetes"
elif [[ ${docker_storage} == "devicemapper" || ${docker_storage} == "aufs" ]]; then elif [[ ${docker_storage} == "devicemapper" || ${docker_storage} == "aufs" ]]; then
# We always use LVM, even with one device # We always use LVM, even with one device
# In devicemapper mode, Docker can use LVM directly # In devicemapper mode, Docker can use LVM directly
@ -144,21 +147,21 @@ else
fi fi
mkfs -t ext4 /dev/vg-ephemeral/docker mkfs -t ext4 /dev/vg-ephemeral/docker
mkdir -p /mnt/docker mkdir -p /mnt/ephemeral/docker
echo "/dev/vg-ephemeral/docker /mnt/docker ext4 noatime 0 0" >> /etc/fstab echo "/dev/vg-ephemeral/docker /mnt/ephemeral/docker ext4 noatime 0 0" >> /etc/fstab
mount /mnt/docker mount /mnt/ephemeral/docker
move_docker="/mnt" move_docker="/mnt/ephemeral"
fi fi
# Remaining 5% is for kubernetes data # Remaining 5% is for kubernetes data
# TODO: Should this be a thin pool? e.g. would we ever want to snapshot this data? # TODO: Should this be a thin pool? e.g. would we ever want to snapshot this data?
lvcreate -l 100%FREE -n kubernetes vg-ephemeral lvcreate -l 100%FREE -n kubernetes vg-ephemeral
mkfs -t ext4 /dev/vg-ephemeral/kubernetes mkfs -t ext4 /dev/vg-ephemeral/kubernetes
mkdir -p /mnt/kubernetes mkdir -p /mnt/ephemeral/kubernetes
echo "/dev/vg-ephemeral/kubernetes /mnt/kubernetes ext4 noatime 0 0" >> /etc/fstab echo "/dev/vg-ephemeral/kubernetes /mnt/ephemeral/kubernetes ext4 noatime 0 0" >> /etc/fstab
mount /mnt/kubernetes mount /mnt/ephemeral/kubernetes
move_kubelet="/mnt/kubernetes" move_kubelet="/mnt/ephemeral/kubernetes"
else else
echo "Ignoring unknown DOCKER_STORAGE: ${docker_storage}" echo "Ignoring unknown DOCKER_STORAGE: ${docker_storage}"
fi fi

1
cluster/aws/templates/setup-master-pd.sh
View File

@ -22,6 +22,7 @@ echo "Mounting master-pd"
mkdir -p /mnt/master-pd mkdir -p /mnt/master-pd
mkfs -t ext4 /dev/xvdb mkfs -t ext4 /dev/xvdb
echo "/dev/xvdb /mnt/master-pd ext4 noatime 0 0" >> /etc/fstab echo "/dev/xvdb /mnt/master-pd ext4 noatime 0 0" >> /etc/fstab
mount /mnt/master-pd
# Contains all the data stored in etcd # Contains all the data stored in etcd
mkdir -m 700 -p /mnt/master-pd/var/etcd mkdir -m 700 -p /mnt/master-pd/var/etcd