Fix binaries cleanup for eksd/amzn2

Signed-off-by: Artiom Diomin <kron82@gmail.com>

pkg/scripts/os_amzn.go

@@ -164,14 +164,23 @@ sudo systemctl restart kubelet
 `
 
 	removeBinariesAmazonLinuxScriptTemplate = `
-# Stop kubelet
 sudo systemctl stop kubelet || true
+
+sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni
+sudo yum remove -y \
+	kubelet \
+	kubeadm \
+	kubectl \
+	kubernetes-cni
+
+# Stop kubelet
 # Remove CNI and binaries
 sudo rm -rf /opt/cni /opt/bin/kubeadm /opt/bin/kubectl /opt/bin/kubelet
 # Remove symlinks
 sudo rm -rf /usr/bin/kubeadm /usr/bin/kubectl /usr/bin/kubelet
 # Remove systemd unit files
 sudo rm -f /etc/systemd/system/kubelet.service /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+
 # Reload systemd
 sudo systemctl daemon-reload
 `

pkg/scripts/testdata/TestRemoveBinariesAmazonLinux.golden

@@ -1,13 +1,22 @@
 set -xeu pipefail
 export "PATH=$PATH:/sbin:/usr/local/bin:/opt/bin"
 
-# Stop kubelet
 sudo systemctl stop kubelet || true
+
+sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni
+sudo yum remove -y \
+	kubelet \
+	kubeadm \
+	kubectl \
+	kubernetes-cni
+
+# Stop kubelet
 # Remove CNI and binaries
 sudo rm -rf /opt/cni /opt/bin/kubeadm /opt/bin/kubectl /opt/bin/kubelet
 # Remove symlinks
 sudo rm -rf /usr/bin/kubeadm /usr/bin/kubectl /usr/bin/kubelet
 # Remove systemd unit files
 sudo rm -f /etc/systemd/system/kubelet.service /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+
 # Reload systemd
 sudo systemctl daemon-reload

test/e2e/eksd.go

@@ -88,13 +88,6 @@ func EksdTerraformFlags(provider string) ([]string, error) {
 		flags := []string{
 			"-var", "initial_machinedeployment_replicas=0",
 			"-var", "static_workers_count=3",
-			// Amazon Linux 2 is currently not supported by machine-controller.
-			// If we would try to create a MachineDeployment using Amazon Linux,
-			// the validation webhook (and therefore cluster provisioning)
-			// would fail.
-			// TODO: Remove this once machine-controller supports Amazon
-			// Linux 2.
-			"-var", "worker_os=ubuntu",
 		}
 		return flags, nil
 	}

test/e2e/os.go

@@ -30,7 +30,7 @@ const (
 	OperatingSystemCentOS7 OperatingSystem = "centos7"
 	OperatingSystemCentOS8 OperatingSystem = "centos"
 	OperatingSystemFlatcar OperatingSystem = "flatcar"
-	OperatingSystemAmazon  OperatingSystem = "amazon_linux2"
+	OperatingSystemAmazon  OperatingSystem = "amzn2"
 	OperatingSystemDefault OperatingSystem = ""
 )