Remove the baremetal cloud provider

kubernetes · Jun 14, 2020 · 9f3336d · 9f3336d
1 parent b8e7584
commit 9f3336d
Show file tree

Hide file tree

Showing 21 changed files with 0 additions and 481 deletions.
diff --git a/cmd/kops/BUILD.bazel b/cmd/kops/BUILD.bazel
@@ -42,7 +42,6 @@ go_library(
         "set.go",
         "set_cluster.go",
         "toolbox.go",
-        "toolbox_bundle.go",
         "toolbox_convert_imported.go",
         "toolbox_dump.go",
         "toolbox_template.go",
@@ -65,7 +64,6 @@ go_library(
         "//pkg/apis/kops/util:go_default_library",
         "//pkg/apis/kops/validation:go_default_library",
         "//pkg/assets:go_default_library",
-        "//pkg/bundle:go_default_library",
         "//pkg/client/simple:go_default_library",
         "//pkg/cloudinstances:go_default_library",
         "//pkg/commands:go_default_library",
@@ -104,7 +102,6 @@ go_library(
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/github.com/spf13/cobra/doc:go_default_library",
         "//vendor/github.com/spf13/viper:go_default_library",
-        "//vendor/golang.org/x/crypto/ssh:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",

diff --git a/cmd/kops/toolbox.go b/cmd/kops/toolbox.go
@@ -47,7 +47,6 @@ func NewCmdToolbox(f *util.Factory, out io.Writer) *cobra.Command {
 
 	cmd.AddCommand(NewCmdToolboxConvertImported(f, out))
 	cmd.AddCommand(NewCmdToolboxDump(f, out))
-	cmd.AddCommand(NewCmdToolboxBundle(f, out))
 	cmd.AddCommand(NewCmdToolboxTemplate(f, out))
 
 	return cmd

diff --git a/cmd/kops/toolbox_bundle.go b/cmd/kops/toolbox_bundle.go
diff --git a/docs/cli/kops_toolbox.md b/docs/cli/kops_toolbox.md
@@ -45,7 +45,6 @@ Misc infrequently used commands.
 ### SEE ALSO
 
 * [kops](kops.md)	 - kops is Kubernetes ops.
-* [kops toolbox bundle](kops_toolbox_bundle.md)	 - Bundle cluster information
 * [kops toolbox convert-imported](kops_toolbox_convert-imported.md)	 - Convert an imported cluster into a kops cluster.
 * [kops toolbox dump](kops_toolbox_dump.md)	 - Dump cluster information
 * [kops toolbox template](kops_toolbox_template.md)	 - Generate cluster.yaml from template

diff --git a/docs/cli/kops_toolbox_bundle.md b/docs/cli/kops_toolbox_bundle.md
diff --git a/hack/.packages b/hack/.packages
@@ -166,7 +166,6 @@ k8s.io/kops/upup/pkg/fi/cloudup/alitasks
 k8s.io/kops/upup/pkg/fi/cloudup/aliup
 k8s.io/kops/upup/pkg/fi/cloudup/awstasks
 k8s.io/kops/upup/pkg/fi/cloudup/awsup
-k8s.io/kops/upup/pkg/fi/cloudup/baremetal
 k8s.io/kops/upup/pkg/fi/cloudup/cloudformation
 k8s.io/kops/upup/pkg/fi/cloudup/dnstasks
 k8s.io/kops/upup/pkg/fi/cloudup/do

diff --git a/pkg/apis/kops/channel.go b/pkg/apis/kops/channel.go
@@ -247,7 +247,6 @@ type CloudProviderID string
 const (
 	CloudProviderALI       CloudProviderID = "alicloud"
 	CloudProviderAWS       CloudProviderID = "aws"
-	CloudProviderBareMetal CloudProviderID = "baremetal"
 	CloudProviderDO        CloudProviderID = "digitalocean"
 	CloudProviderGCE       CloudProviderID = "gce"
 	CloudProviderOpenstack CloudProviderID = "openstack"

diff --git a/pkg/apis/kops/validation/legacy.go b/pkg/apis/kops/validation/legacy.go
@@ -56,14 +56,6 @@ func ValidateCluster(c *kops.Cluster, strict bool) field.ErrorList {
 		requiresSubnetCIDR = false
 		requiresNetworkCIDR = false
 
-	case kops.CloudProviderBareMetal:
-		requiresSubnets = false
-		requiresSubnetCIDR = false
-		requiresNetworkCIDR = false
-		if c.Spec.NetworkCIDR != "" {
-			allErrs = append(allErrs, field.Forbidden(fieldSpec.Child("networkCIDR"), "networkCIDR should not be set on bare metal"))
-		}
-
 	case kops.CloudProviderGCE:
 		requiresNetworkCIDR = false
 		if c.Spec.NetworkCIDR != "" {
@@ -89,7 +81,6 @@ func ValidateCluster(c *kops.Cluster, strict bool) field.ErrorList {
 
 	default:
 		allErrs = append(allErrs, field.NotSupported(fieldSpec.Child("cloudProvider"), c.Spec.CloudProvider, []string{
-			string(kops.CloudProviderBareMetal),
 			string(kops.CloudProviderGCE),
 			string(kops.CloudProviderDO),
 			string(kops.CloudProviderALI),
@@ -301,8 +292,6 @@ func ValidateCluster(c *kops.Cluster, strict bool) field.ErrorList {
 			k8sCloudProvider = "gce"
 		case kops.CloudProviderDO:
 			k8sCloudProvider = "external"
-		case kops.CloudProviderBareMetal:
-			k8sCloudProvider = ""
 		case kops.CloudProviderOpenstack:
 			k8sCloudProvider = "openstack"
 		case kops.CloudProviderALI:

diff --git a/pkg/model/components/apiserver.go b/pkg/model/components/apiserver.go
@@ -145,8 +145,6 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
 		c.CloudProvider = "gce"
 	case kops.CloudProviderDO:
 		c.CloudProvider = "external"
-	case kops.CloudProviderBareMetal:
-		// for baremetal, we don't specify a cloudprovider to apiserver
 	case kops.CloudProviderOpenstack:
 		c.CloudProvider = "openstack"
 	case kops.CloudProviderALI:

diff --git a/pkg/model/components/kubecontrollermanager.go b/pkg/model/components/kubecontrollermanager.go
@@ -92,9 +92,6 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
 	case kops.CloudProviderDO:
 		kcm.CloudProvider = "external"
 
-	case kops.CloudProviderBareMetal:
-		// No cloudprovider
-
 	case kops.CloudProviderOpenstack:
 		kcm.CloudProvider = "openstack"
 

diff --git a/pkg/model/master_volumes.go b/pkg/model/master_volumes.go
@@ -21,7 +21,6 @@ import (
 	"sort"
 	"strings"
 
-	"k8s.io/klog"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/apis/kops/model"
 	"k8s.io/kops/upup/pkg/fi"
@@ -101,8 +100,6 @@ func (b *MasterVolumeBuilder) Build(c *fi.ModelBuilderContext) error {
 				b.addDOVolume(c, name, volumeSize, zone, etcd, m, allMembers)
 			case kops.CloudProviderGCE:
 				b.addGCEVolume(c, name, volumeSize, zone, etcd, m, allMembers)
-			case kops.CloudProviderBareMetal:
-				klog.Fatalf("BareMetal not implemented")
 			case kops.CloudProviderOpenstack:
 				err = b.addOpenstackVolume(c, name, volumeSize, zone, etcd, m, allMembers)
 				if err != nil {

diff --git a/protokube/cmd/protokube/main.go b/protokube/cmd/protokube/main.go
@@ -176,15 +176,6 @@ func run() error {
 		if internalIP == nil {
 			internalIP = gceVolumes.InternalIP()
 		}
-	} else if cloud == "baremetal" {
-		if internalIP == nil {
-			ip, err := findInternalIP()
-			if err != nil {
-				klog.Errorf("error finding internal IP: %v", err)
-				os.Exit(1)
-			}
-			internalIP = ip
-		}
 	} else if cloud == "openstack" {
 		klog.Info("Initializing openstack volumes")
 		osVolumes, err := protokube.NewOpenstackVolumes()

diff --git a/protokube/pkg/protokube/BUILD.bazel b/protokube/pkg/protokube/BUILD.bazel
@@ -5,7 +5,6 @@ go_library(
     srcs = [
         "ali_volume.go",
         "aws_volume.go",
-        "baremetal_volume.go",
         "channels.go",
         "do_volume.go",
         "etcd_cluster.go",