Remove CoreOS (#1232)

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

examples/terraform/azure/variables.tf

@@ -24,7 +24,6 @@ variable "worker_os" {
   # valid choices are:
   # * ubuntu
   # * centos
-  # * coreos
   default = "ubuntu"
 }
 

examples/terraform/digitalocean/variables.tf

@@ -24,7 +24,6 @@ variable "worker_os" {
   # valid choices are:
   # * ubuntu
   # * centos
-  # * coreos
   default = "ubuntu"
 }
 

examples/terraform/gce/variables.tf

@@ -24,7 +24,6 @@ variable "worker_os" {
   # valid choices are:
   # * ubuntu
   # * centos
-  # * coreos
   default = "ubuntu"
 }
 

examples/terraform/hetzner/variables.tf

@@ -24,7 +24,6 @@ variable "worker_os" {
   # valid choices are:
   # * ubuntu
   # * centos
-  # * coreos
   default = "ubuntu"
 }
 

examples/terraform/openstack/variables.tf

@@ -24,7 +24,6 @@ variable "worker_os" {
   # valid choices are:
   # * ubuntu
   # * centos
-  # * coreos
   default = "ubuntu"
 }
 

examples/terraform/packet/variables.tf

@@ -24,7 +24,6 @@ variable "worker_os" {
   # valid choices are:
   # * ubuntu
   # * centos
-  # * coreos
   default = "ubuntu"
 }
 

examples/terraform/vsphere/variables.tf

@@ -24,7 +24,6 @@ variable "worker_os" {
   # valid choices are:
   # * ubuntu
   # * centos
-  # * coreos
   default = "ubuntu"
 }
 

pkg/apis/kubeone/types.go

@@ -78,12 +78,11 @@ type ContainerRuntimeContainerd struct{}
 // OperatingSystemName defines the operating system used on instances
 type OperatingSystemName string
 
-var (
+const (
 	OperatingSystemNameUbuntu  OperatingSystemName = "ubuntu"
 	OperatingSystemNameCentOS  OperatingSystemName = "centos"
 	OperatingSystemNameRHEL    OperatingSystemName = "rhel"
 	OperatingSystemNameAmazon  OperatingSystemName = "amzn"
-	OperatingSystemNameCoreOS  OperatingSystemName = "coreos"
 	OperatingSystemNameFlatcar OperatingSystemName = "flatcar"
 	OperatingSystemNameUnknown OperatingSystemName = ""
 )

pkg/apis/kubeone/v1beta1/types.go

@@ -78,12 +78,11 @@ type ContainerRuntimeContainerd struct{}
 // OperatingSystemName defines the operating system used on instances
 type OperatingSystemName string
 
-var (
+const (
 	OperatingSystemNameUbuntu  OperatingSystemName = "ubuntu"
 	OperatingSystemNameCentOS  OperatingSystemName = "centos"
 	OperatingSystemNameRHEL    OperatingSystemName = "rhel"
 	OperatingSystemNameAmazon  OperatingSystemName = "amzn"
-	OperatingSystemNameCoreOS  OperatingSystemName = "coreos"
 	OperatingSystemNameFlatcar OperatingSystemName = "flatcar"
 	OperatingSystemNameUnknown OperatingSystemName = ""
 )

pkg/scripts/os.go

@@ -307,7 +307,7 @@ sudo systemctl restart kubelet
 {{- end }}
 `
 
-	kubeadmCoreOSTemplate = `
+	kubeadmFlatcarTemplate = `
 source /etc/kubeone/proxy-env
 
 {{ template "detect-host-cpu-architecture" }}
@@ -400,7 +400,7 @@ sudo rm -f /etc/systemd/system/kubelet.service /etc/systemd/system/kubelet.servi
 sudo systemctl daemon-reload
 `
 
-	removeBinariesCoreOSScriptTemplate = `
+	removeBinariesFlatcarScriptTemplate = `
 # Stop kubelet
 sudo systemctl stop kubelet || true
 # Remove CNI and binaries
@@ -411,7 +411,7 @@ sudo rm -f /etc/systemd/system/kubelet.service /etc/systemd/system/kubelet.servi
 sudo systemctl daemon-reload
 `
 
-	upgradeKubeadmAndCNICoreOSScriptTemplate = `
+	upgradeKubeadmAndCNIFlatcarScriptTemplate = `
 {{ template "detect-host-cpu-architecture" }}
 
 source /etc/kubeone/proxy-env
@@ -433,7 +433,7 @@ sudo mv /var/tmp/kube-binaries/kubeadm .
 sudo chmod +x kubeadm
 `
 
-	upgradeKubeletAndKubectlCoreOSScriptTemplate = `
+	upgradeKubeletAndKubectlFlatcarScriptTemplate = `
 source /etc/kubeone/proxy-env
 
 {{ template "detect-host-cpu-architecture" }}
@@ -547,8 +547,8 @@ func KubeadmAmazonLinux(cluster *kubeone.KubeOneCluster, force bool) (string, er
 	})
 }
 
-func KubeadmCoreOS(cluster *kubeone.KubeOneCluster) (string, error) {
-	return Render(kubeadmCoreOSTemplate, Data{
+func KubeadmFlatcar(cluster *kubeone.KubeOneCluster) (string, error) {
+	return Render(kubeadmFlatcarTemplate, Data{
 		"KUBERNETES_VERSION":     cluster.Versions.Kubernetes,
 		"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
 		"INSECURE_REGISTRY":      cluster.RegistryConfiguration.InsecureRegistryAddress(),
@@ -567,8 +567,8 @@ func RemoveBinariesAmazonLinux() (string, error) {
 	return Render(removeBinariesAmazonLinuxScriptTemplate, Data{})
 }
 
-func RemoveBinariesCoreOS() (string, error) {
-	return Render(removeBinariesCoreOSScriptTemplate, nil)
+func RemoveBinariesFlatcar() (string, error) {
+	return Render(removeBinariesFlatcarScriptTemplate, nil)
 }
 
 func UpgradeKubeadmAndCNIDebian(cluster *kubeone.KubeOneCluster) (string, error) {
@@ -626,8 +626,8 @@ func UpgradeKubeadmAndCNIAmazonLinux(cluster *kubeone.KubeOneCluster) (string, e
 	})
 }
 
-func UpgradeKubeadmAndCNICoreOS(k8sVersion string) (string, error) {
-	return Render(upgradeKubeadmAndCNICoreOSScriptTemplate, Data{
+func UpgradeKubeadmAndCNIFlatcar(k8sVersion string) (string, error) {
+	return Render(upgradeKubeadmAndCNIFlatcarScriptTemplate, Data{
 		"KUBERNETES_VERSION":     k8sVersion,
 		"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
 	})
@@ -691,8 +691,8 @@ func UpgradeKubeletAndKubectlAmazonLinux(cluster *kubeone.KubeOneCluster) (strin
 	})
 }
 
-func UpgradeKubeletAndKubectlCoreOS(k8sVersion string) (string, error) {
-	return Render(upgradeKubeletAndKubectlCoreOSScriptTemplate, Data{
+func UpgradeKubeletAndKubectlFlatcar(k8sVersion string) (string, error) {
+	return Render(upgradeKubeletAndKubectlFlatcarScriptTemplate, Data{
 		"KUBERNETES_VERSION": k8sVersion,
 	})
 }

pkg/scripts/os_test.go

@@ -337,7 +337,7 @@ func TestKubeadmAmazonLinux(t *testing.T) {
 	}
 }
 
-func TestKubeadmCoreOS(t *testing.T) {
+func TestKubeadmFlatcar(t *testing.T) {
 	t.Parallel()
 
 	type args struct {
@@ -377,9 +377,9 @@ func TestKubeadmCoreOS(t *testing.T) {
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := KubeadmCoreOS(&tt.args.cluster)
+			got, err := KubeadmFlatcar(&tt.args.cluster)
 			if err != tt.err {
-				t.Errorf("KubeadmCoreOS() error = %v, wantErr %v", err, tt.err)
+				t.Errorf("KubeadmFlatcar() error = %v, wantErr %v", err, tt.err)
 				return
 			}
 
@@ -424,12 +424,12 @@ func TestRemoveBinariesAmazonLinux(t *testing.T) {
 	testhelper.DiffOutput(t, testhelper.FSGoldenName(t), got, *updateFlag)
 }
 
-func TestRemoveBinariesCoreOS(t *testing.T) {
+func TestRemoveBinariesFlatcar(t *testing.T) {
 	t.Parallel()
 
-	got, err := RemoveBinariesCoreOS()
+	got, err := RemoveBinariesFlatcar()
 	if err != nil {
-		t.Errorf("RemoveBinariesCoreOS() error = %v", err)
+		t.Errorf("RemoveBinariesFlatcar() error = %v", err)
 		return
 	}
 
@@ -475,12 +475,12 @@ func TestUpgradeKubeadmAndCNIAmazonLinux(t *testing.T) {
 	testhelper.DiffOutput(t, testhelper.FSGoldenName(t), got, *updateFlag)
 }
 
-func TestUpgradeKubeadmAndCNICoreOS(t *testing.T) {
+func TestUpgradeKubeadmAndCNIFlatcar(t *testing.T) {
 	t.Parallel()
 
-	got, err := UpgradeKubeadmAndCNICoreOS("v1.17.4")
+	got, err := UpgradeKubeadmAndCNIFlatcar("v1.17.4")
 	if err != nil {
-		t.Errorf("UpgradeKubeadmAndCNICoreOS() error = %v", err)
+		t.Errorf("UpgradeKubeadmAndCNIFlatcar() error = %v", err)
 		return
 	}
 
@@ -526,12 +526,12 @@ func TestUpgradeKubeletAndKubectlAmazonLinux(t *testing.T) {
 	testhelper.DiffOutput(t, testhelper.FSGoldenName(t), got, *updateFlag)
 }
 
-func TestUpgradeKubeletAndKubectlCoreOS(t *testing.T) {
+func TestUpgradeKubeletAndKubectlFlatcar(t *testing.T) {
 	t.Parallel()
 
-	got, err := UpgradeKubeletAndKubectlCoreOS("v1.17.4")
+	got, err := UpgradeKubeletAndKubectlFlatcar("v1.17.4")
 	if err != nil {
-		t.Errorf("UpgradeKubeletAndKubectlCoreOS() error = %v", err)
+		t.Errorf("UpgradeKubeletAndKubectlFlatcar() error = %v", err)
 		return
 	}
 

pkg/tasks/kubernetes_binaries.go

@@ -27,8 +27,7 @@ import (
 func upgradeKubeletAndKubectlBinaries(s *state.State, node kubeoneapi.HostConfig) error {
 	return runOnOS(s, node.OperatingSystem, map[kubeoneapi.OperatingSystemName]runOnOSFn{
 		kubeoneapi.OperatingSystemNameUbuntu:  upgradeKubeletAndKubectlBinariesDebian,
-		kubeoneapi.OperatingSystemNameCoreOS:  upgradeKubeletAndKubectlBinariesCoreOS,
-		kubeoneapi.OperatingSystemNameFlatcar: upgradeKubeletAndKubectlBinariesCoreOS,
+		kubeoneapi.OperatingSystemNameFlatcar: upgradeKubeletAndKubectlBinariesFlatcar,
 		kubeoneapi.OperatingSystemNameCentOS:  upgradeKubeletAndKubectlBinariesCentOS,
 		kubeoneapi.OperatingSystemNameAmazon:  upgradeKubeletAndKubectlBinariesAmazonLinux,
 		kubeoneapi.OperatingSystemNameRHEL:    upgradeKubeletAndKubectlBinariesCentOS,
@@ -38,8 +37,7 @@ func upgradeKubeletAndKubectlBinaries(s *state.State, node kubeoneapi.HostConfig
 func upgradeKubeadmAndCNIBinaries(s *state.State, node kubeoneapi.HostConfig) error {
 	return runOnOS(s, node.OperatingSystem, map[kubeoneapi.OperatingSystemName]runOnOSFn{
 		kubeoneapi.OperatingSystemNameUbuntu:  upgradeKubeadmAndCNIBinariesDebian,
-		kubeoneapi.OperatingSystemNameCoreOS:  upgradeKubeadmAndCNIBinariesCoreOS,
-		kubeoneapi.OperatingSystemNameFlatcar: upgradeKubeadmAndCNIBinariesCoreOS,
+		kubeoneapi.OperatingSystemNameFlatcar: upgradeKubeadmAndCNIBinariesFlatcar,
 		kubeoneapi.OperatingSystemNameCentOS:  upgradeKubeadmAndCNIBinariesCentOS,
 		kubeoneapi.OperatingSystemNameAmazon:  upgradeKubeadmAndCNIBinariesAmazonLinux,
 		kubeoneapi.OperatingSystemNameRHEL:    upgradeKubeadmAndCNIBinariesCentOS,
@@ -57,8 +55,8 @@ func upgradeKubeletAndKubectlBinariesDebian(s *state.State) error {
 	return errors.WithStack(err)
 }
 
-func upgradeKubeletAndKubectlBinariesCoreOS(s *state.State) error {
-	cmd, err := scripts.UpgradeKubeletAndKubectlCoreOS(s.Cluster.Versions.Kubernetes)
+func upgradeKubeletAndKubectlBinariesFlatcar(s *state.State) error {
+	cmd, err := scripts.UpgradeKubeletAndKubectlFlatcar(s.Cluster.Versions.Kubernetes)
 	if err != nil {
 		return err
 	}
@@ -123,8 +121,8 @@ func upgradeKubeadmAndCNIBinariesAmazonLinux(s *state.State) error {
 	return errors.WithStack(err)
 }
 
-func upgradeKubeadmAndCNIBinariesCoreOS(s *state.State) error {
-	cmd, err := scripts.UpgradeKubeadmAndCNICoreOS(s.Cluster.Versions.Kubernetes)
+func upgradeKubeadmAndCNIBinariesFlatcar(s *state.State) error {
+	cmd, err := scripts.UpgradeKubeadmAndCNIFlatcar(s.Cluster.Versions.Kubernetes)
 	if err != nil {
 		return err
 	}

pkg/tasks/prerequisites.go

@@ -86,9 +86,8 @@ func createEnvironmentFile(s *state.State) error {
 func installKubeadm(s *state.State, node kubeoneapi.HostConfig) error {
 	return runOnOS(s, node.OperatingSystem, map[kubeoneapi.OperatingSystemName]runOnOSFn{
 		kubeoneapi.OperatingSystemNameUbuntu:  installKubeadmDebian,
-		kubeoneapi.OperatingSystemNameCoreOS:  installKubeadmCoreOS,
 		kubeoneapi.OperatingSystemNameAmazon:  installKubeadmAmazonLinux,
-		kubeoneapi.OperatingSystemNameFlatcar: installKubeadmCoreOS,
+		kubeoneapi.OperatingSystemNameFlatcar: installKubeadmFlatcar,
 		kubeoneapi.OperatingSystemNameCentOS:  installKubeadmCentOS,
 		kubeoneapi.OperatingSystemNameRHEL:    installKubeadmCentOS,
 	})
@@ -127,8 +126,8 @@ func installKubeadmAmazonLinux(s *state.State) error {
 	return errors.WithStack(err)
 }
 
-func installKubeadmCoreOS(s *state.State) error {
-	cmd, err := scripts.KubeadmCoreOS(s.Cluster)
+func installKubeadmFlatcar(s *state.State) error {
+	cmd, err := scripts.KubeadmFlatcar(s.Cluster)
 	if err != nil {
 		return err
 	}

pkg/tasks/probes.go

@@ -110,8 +110,7 @@ func runProbes(s *state.State) error {
 	}
 
 	for _, host := range s.Cluster.ControlPlane.Hosts {
-		switch host.OperatingSystem {
-		case kubeoneapi.OperatingSystemNameFlatcar, kubeoneapi.OperatingSystemNameCoreOS:
+		if host.OperatingSystem == kubeoneapi.OperatingSystemNameFlatcar {
 			s.Cluster.ContainerRuntime.Docker = &kubeoneapi.ContainerRuntimeDocker{}
 		}
 	}
@@ -189,8 +188,7 @@ func investigateHost(s *state.State, node *kubeoneapi.HostConfig, conn ssh.Conne
 
 	containerRuntimeOpts := []systemdUnitInfoOpt{withComponentVersion(versionCmdGenerator)}
 
-	switch h.Config.OperatingSystem {
-	case kubeoneapi.OperatingSystemNameCoreOS, kubeoneapi.OperatingSystemNameFlatcar:
+	if h.Config.OperatingSystem == kubeoneapi.OperatingSystemNameFlatcar {
 		// Flatcar is special
 		containerRuntimeOpts = []systemdUnitInfoOpt{withFlatcarContainerRuntimeVersion}
 	}

pkg/tasks/reset.go

@@ -130,8 +130,7 @@ func removeBinaries(s *state.State, node *kubeoneapi.HostConfig, conn ssh.Connec
 
 	return runOnOS(s, node.OperatingSystem, map[kubeoneapi.OperatingSystemName]runOnOSFn{
 		kubeoneapi.OperatingSystemNameUbuntu:  removeBinariesDebian,
-		kubeoneapi.OperatingSystemNameCoreOS:  removeBinariesCoreOS,
-		kubeoneapi.OperatingSystemNameFlatcar: removeBinariesCoreOS,
+		kubeoneapi.OperatingSystemNameFlatcar: removeBinariesFlatcar,
 		kubeoneapi.OperatingSystemNameCentOS:  removeBinariesCentOS,
 		kubeoneapi.OperatingSystemNameRHEL:    removeBinariesCentOS,
 		kubeoneapi.OperatingSystemNameAmazon:  removeBinariesAmazonLinux,
@@ -168,8 +167,8 @@ func removeBinariesAmazonLinux(s *state.State) error {
 	return errors.WithStack(err)
 }
 
-func removeBinariesCoreOS(s *state.State) error {
-	cmd, err := scripts.RemoveBinariesCoreOS()
+func removeBinariesFlatcar(s *state.State) error {
+	cmd, err := scripts.RemoveBinariesFlatcar()
 	if err != nil {
 		return err
 	}

test/e2e/os.go

@@ -29,7 +29,6 @@ const (
 	OperatingSystemUbuntu  OperatingSystem = "ubuntu"
 	OperatingSystemCentOS7 OperatingSystem = "centos7"
 	OperatingSystemCentOS8 OperatingSystem = "centos"
-	OperatingSystemCoreOS  OperatingSystem = "coreos"
 	OperatingSystemFlatcar OperatingSystem = "flatcar"
 	OperatingSystemDefault OperatingSystem = ""
 )
@@ -40,8 +39,11 @@ const (
 
 func ValidateOperatingSystem(osName string) error {
 	switch OperatingSystem(osName) {
-	case OperatingSystemUbuntu, OperatingSystemCoreOS, OperatingSystemFlatcar,
-		OperatingSystemCentOS7, OperatingSystemCentOS8, OperatingSystemDefault:
+	case OperatingSystemUbuntu,
+		OperatingSystemFlatcar,
+		OperatingSystemCentOS7,
+		OperatingSystemCentOS8,
+		OperatingSystemDefault:
 		return nil
 	}
 	return errors.New("failed to validate operating system")
@@ -79,7 +81,7 @@ func sshUsername(osName OperatingSystem) (string, error) {
 		return "ubuntu", nil
 	case OperatingSystemCentOS7, OperatingSystemCentOS8:
 		return "centos", nil
-	case OperatingSystemCoreOS, OperatingSystemFlatcar:
+	case OperatingSystemFlatcar:
 		return "core", nil
 	}