From 9ddd3e1778a6e5bd320cdda8ba0168bddd11572a Mon Sep 17 00:00:00 2001
From: Avi Deitcher <avi@deitcher.net>
Date: Sun, 21 Apr 2019 11:12:54 +0300
Subject: [PATCH] Add swapoff to centos so kubelet starts

---
 pkg/userdata/centos/provider.go                             | 6 ++++++
 pkg/userdata/centos/testdata/kubelet-v1.10-aws.golden       | 6 ++++++
 pkg/userdata/centos/testdata/kubelet-v1.11-aws.golden       | 6 ++++++
 .../centos/testdata/kubelet-v1.12-aws-external.golden       | 6 ++++++
 pkg/userdata/centos/testdata/kubelet-v1.12-aws.golden       | 6 ++++++
 pkg/userdata/centos/testdata/kubelet-v1.12-vsphere.golden   | 6 ++++++
 pkg/userdata/centos/testdata/kubelet-v1.9-aws.golden        | 6 ++++++
 pkg/userdata/ubuntu/provider.go                             | 4 +++-
 pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.golden    | 4 +++-
 .../ubuntu/testdata/kubelet-version-without-v-prefix.golden | 4 +++-
 pkg/userdata/ubuntu/testdata/multiple-dns-servers.golden    | 4 +++-
 pkg/userdata/ubuntu/testdata/multiple-ssh-keys.golden       | 4 +++-
 .../ubuntu/testdata/openstack-overwrite-cloud-config.golden | 4 +++-
 pkg/userdata/ubuntu/testdata/openstack.golden               | 4 +++-
 pkg/userdata/ubuntu/testdata/version-1.10.10.golden         | 4 +++-
 pkg/userdata/ubuntu/testdata/version-1.11.3.golden          | 4 +++-
 pkg/userdata/ubuntu/testdata/version-1.12.1.golden          | 4 +++-
 pkg/userdata/ubuntu/testdata/version-1.9.10.golden          | 4 +++-
 pkg/userdata/ubuntu/testdata/vsphere.golden                 | 4 +++-
 19 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/pkg/userdata/centos/provider.go b/pkg/userdata/centos/provider.go
index 88d5a881a..5b4f815bf 100644
--- a/pkg/userdata/centos/provider.go
+++ b/pkg/userdata/centos/provider.go
@@ -168,6 +168,12 @@ write_files:
     systemctl restart systemd-modules-load.service
     sysctl --system
 
+    # Make sure we always disable swap - Otherwise the kubelet won't start
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
+    swapoff -a
+
     {{ if ne .CloudProvider "aws" }}
     # The normal way of setting it via cloud-init is broken:
     # https://bugs.launchpad.net/cloud-init/+bug/1662542
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.10-aws.golden b/pkg/userdata/centos/testdata/kubelet-v1.10-aws.golden
index d87d8ef11..9f589dcc0 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.10-aws.golden
+++ b/pkg/userdata/centos/testdata/kubelet-v1.10-aws.golden
@@ -56,6 +56,12 @@ write_files:
     systemctl restart systemd-modules-load.service
     sysctl --system
 
+    # Make sure we always disable swap - Otherwise the kubelet won't start
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
+    swapoff -a
+
     
 
     yum install -y docker-1.13.1 \
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.11-aws.golden b/pkg/userdata/centos/testdata/kubelet-v1.11-aws.golden
index 469cac72a..ddeba4b9b 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.11-aws.golden
+++ b/pkg/userdata/centos/testdata/kubelet-v1.11-aws.golden
@@ -56,6 +56,12 @@ write_files:
     systemctl restart systemd-modules-load.service
     sysctl --system
 
+    # Make sure we always disable swap - Otherwise the kubelet won't start
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
+    swapoff -a
+
     
 
     yum install -y docker-1.13.1 \
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.12-aws-external.golden b/pkg/userdata/centos/testdata/kubelet-v1.12-aws-external.golden
index c1eb41c22..69a1d3b3b 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.12-aws-external.golden
+++ b/pkg/userdata/centos/testdata/kubelet-v1.12-aws-external.golden
@@ -56,6 +56,12 @@ write_files:
     systemctl restart systemd-modules-load.service
     sysctl --system
 
+    # Make sure we always disable swap - Otherwise the kubelet won't start
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
+    swapoff -a
+
     
 
     yum install -y docker-1.13.1 \
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.12-aws.golden b/pkg/userdata/centos/testdata/kubelet-v1.12-aws.golden
index 763bc29ae..acccaeb32 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.12-aws.golden
+++ b/pkg/userdata/centos/testdata/kubelet-v1.12-aws.golden
@@ -56,6 +56,12 @@ write_files:
     systemctl restart systemd-modules-load.service
     sysctl --system
 
+    # Make sure we always disable swap - Otherwise the kubelet won't start
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
+    swapoff -a
+
     
 
     yum install -y docker-1.13.1 \
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.12-vsphere.golden b/pkg/userdata/centos/testdata/kubelet-v1.12-vsphere.golden
index 411c36c68..5a49b3ca6 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.12-vsphere.golden
+++ b/pkg/userdata/centos/testdata/kubelet-v1.12-vsphere.golden
@@ -59,6 +59,12 @@ write_files:
     systemctl restart systemd-modules-load.service
     sysctl --system
 
+    # Make sure we always disable swap - Otherwise the kubelet won't start
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
+    swapoff -a
+
     
     # The normal way of setting it via cloud-init is broken:
     # https://bugs.launchpad.net/cloud-init/+bug/1662542
diff --git a/pkg/userdata/centos/testdata/kubelet-v1.9-aws.golden b/pkg/userdata/centos/testdata/kubelet-v1.9-aws.golden
index b6e6050c3..77d5d46f3 100644
--- a/pkg/userdata/centos/testdata/kubelet-v1.9-aws.golden
+++ b/pkg/userdata/centos/testdata/kubelet-v1.9-aws.golden
@@ -56,6 +56,12 @@ write_files:
     systemctl restart systemd-modules-load.service
     sysctl --system
 
+    # Make sure we always disable swap - Otherwise the kubelet won't start
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
+    swapoff -a
+
     
 
     yum install -y docker-1.13.1 \
diff --git a/pkg/userdata/ubuntu/provider.go b/pkg/userdata/ubuntu/provider.go
index 5caac890e..803c5428b 100644
--- a/pkg/userdata/ubuntu/provider.go
+++ b/pkg/userdata/ubuntu/provider.go
@@ -221,7 +221,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.golden b/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.golden
index 5005134f0..349cb838e 100644
--- a/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.golden
+++ b/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.golden
@@ -120,7 +120,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.golden b/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.golden
index e7bb8b705..187996ec8 100644
--- a/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.golden
+++ b/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.golden
@@ -120,7 +120,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/multiple-dns-servers.golden b/pkg/userdata/ubuntu/testdata/multiple-dns-servers.golden
index 5145bb5e8..932bc7a00 100644
--- a/pkg/userdata/ubuntu/testdata/multiple-dns-servers.golden
+++ b/pkg/userdata/ubuntu/testdata/multiple-dns-servers.golden
@@ -120,7 +120,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.golden b/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.golden
index acc5846ae..83c641ebc 100644
--- a/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.golden
+++ b/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.golden
@@ -122,7 +122,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.golden b/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.golden
index 4265d8ed5..f18c345d9 100644
--- a/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.golden
+++ b/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.golden
@@ -120,7 +120,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/openstack.golden b/pkg/userdata/ubuntu/testdata/openstack.golden
index f0a9981b8..7a0a85c44 100644
--- a/pkg/userdata/ubuntu/testdata/openstack.golden
+++ b/pkg/userdata/ubuntu/testdata/openstack.golden
@@ -120,7 +120,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/version-1.10.10.golden b/pkg/userdata/ubuntu/testdata/version-1.10.10.golden
index 67d68f669..981faa86e 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.10.10.golden
+++ b/pkg/userdata/ubuntu/testdata/version-1.10.10.golden
@@ -120,7 +120,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/version-1.11.3.golden b/pkg/userdata/ubuntu/testdata/version-1.11.3.golden
index e7bb8b705..187996ec8 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.11.3.golden
+++ b/pkg/userdata/ubuntu/testdata/version-1.11.3.golden
@@ -120,7 +120,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/version-1.12.1.golden b/pkg/userdata/ubuntu/testdata/version-1.12.1.golden
index ce9893a72..09379c69c 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.12.1.golden
+++ b/pkg/userdata/ubuntu/testdata/version-1.12.1.golden
@@ -120,7 +120,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/version-1.9.10.golden b/pkg/userdata/ubuntu/testdata/version-1.9.10.golden
index 0ea3b99f4..7b2e2136b 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.9.10.golden
+++ b/pkg/userdata/ubuntu/testdata/version-1.9.10.golden
@@ -120,7 +120,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'
diff --git a/pkg/userdata/ubuntu/testdata/vsphere.golden b/pkg/userdata/ubuntu/testdata/vsphere.golden
index c90ceda5d..e675a9e93 100644
--- a/pkg/userdata/ubuntu/testdata/vsphere.golden
+++ b/pkg/userdata/ubuntu/testdata/vsphere.golden
@@ -120,7 +120,9 @@ write_files:
     apt-get update
 
     # Make sure we always disable swap - Otherwise the kubelet won't start'.
-    systemctl mask swap.target
+    cp /etc/fstab /etc/fstab.orig
+    cat /etc/fstab.orig | awk '$3 ~ /^swap$/ && $1 !~ /^#/ {$0="# commented out by cloudinit\n#"$0} 1' > /etc/fstab.noswap
+    mv /etc/fstab.noswap /etc/fstab
     swapoff -a
 
     export CR_PKG='docker-ce=5:18.09.2~3-0~ubuntu-bionic'