airship/airship-in-a-bottle
Code Issues Proposed changes

Merge "Verify VM disk size and relax kubelet disk reqs"

Browse Source
This commit is contained in:
Zuul 2019-01-22 19:57:32 +00:00 committed by Gerrit Code Review
commit 55b0de164e
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment_files/global/v1.0demo/software/config/Kubelet.yaml
View File

@ -26,8 +26,10 @@ data:
- --cni-bin-dir=/opt/cni/bin - --cni-bin-dir=/opt/cni/bin
- --cni-conf-dir=/etc/cni/net.d - --cni-conf-dir=/etc/cni/net.d
- --eviction-max-pod-grace-period=-1 - --eviction-max-pod-grace-period=-1
- --eviction-hard="nodefs.available<1Gi,imagefs.available<1Gi"
- --eviction-minimum-reclaim="nodefs.available=1Gi,imagefs.available=1Gi"
- --network-plugin=cni - --network-plugin=cni
- --node-status-update-frequency=5s - --node-status-update-frequency=5s
- --seccomp-profile-root=SECCOMP_PROFILE_ROOT
- --serialize-image-pulls=false - --serialize-image-pulls=false
- --v=5 - --v=5
- --seccomp-profile-root=SECCOMP_PROFILE_ROOT

2
deployment_files/global/v1.0dev/software/config/Kubelet.yaml
View File

@ -19,6 +19,8 @@ data:
- --cni-bin-dir=/opt/cni/bin - --cni-bin-dir=/opt/cni/bin
- --cni-conf-dir=/etc/cni/net.d - --cni-conf-dir=/etc/cni/net.d
- --eviction-max-pod-grace-period=-1 - --eviction-max-pod-grace-period=-1
- --eviction-hard="nodefs.available<1Gi,imagefs.available<1Gi"
- --eviction-minimum-reclaim="nodefs.available=1Gi,imagefs.available=1Gi"
- --network-plugin=cni - --network-plugin=cni
- --node-status-update-frequency=5s - --node-status-update-frequency=5s
- --serialize-image-pulls=false - --serialize-image-pulls=false

4
manifests/dev_single_node/airship-in-a-bottle.sh
View File

@ -66,8 +66,10 @@ echo ""
echo "The minimum recommended size of the Ubuntu 16.04 VM is 4 vCPUs, 20GB of RAM with 32GB disk space." echo "The minimum recommended size of the Ubuntu 16.04 VM is 4 vCPUs, 20GB of RAM with 32GB disk space."
CPU_COUNT=$(grep -c processor /proc/cpuinfo) CPU_COUNT=$(grep -c processor /proc/cpuinfo)
RAM_TOTAL=$(awk '/MemTotal/ {print $2}' /proc/meminfo) RAM_TOTAL=$(awk '/MemTotal/ {print $2}' /proc/meminfo)
# Blindly assume that all storage on this VM is under root FS
DISK_SIZE=$(df --output=source,size / | awk '/dev/ {print $2}')
source /etc/os-release source /etc/os-release
if [[ $CPU_COUNT -lt 4 || $RAM_TOTAL -lt 20000000 || $NAME != "Ubuntu" || $VERSION_ID != "16.04" ]]; then if [[ $CPU_COUNT -lt 4 || $RAM_TOTAL -lt 20000000 || $DISK_SIZE -lt 30000000 || $NAME != "Ubuntu" || $VERSION_ID != "16.04" ]]; then
echo "Error: minimum VM recommendations are not met. Exiting." echo "Error: minimum VM recommendations are not met. Exiting."
exit 1 exit 1
fi fi