Merge pull request #14641 from Mia-Cross/scaleway_create_cluster

Scaleway create cluster

nodeup/pkg/model/protokube.go

@@ -23,6 +23,8 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/blang/semver/v4"
+	"k8s.io/klog/v2"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/apis/kops/util"
 	"k8s.io/kops/pkg/flagbuilder"
@@ -31,11 +33,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
 	"k8s.io/kops/util/pkg/distributions"
-
 	"k8s.io/kops/util/pkg/proxy"
-
-	"github.com/blang/semver/v4"
-	"k8s.io/klog/v2"
 )
 
 // ProtokubeBuilder configures protokube

pkg/apis/kops/validation/legacy.go

@@ -99,6 +99,14 @@ func ValidateCluster(c *kops.Cluster, strict bool) field.ErrorList {
 		requiresNetworkCIDR = false
 		requiresSubnetCIDR = false
 	}
+	if c.Spec.CloudProvider.Scaleway != nil {
+		if optionTaken {
+			allErrs = append(allErrs, field.Forbidden(fieldSpec.Child("scaleway"), "only one cloudProvider option permitted"))
+		}
+		optionTaken = true
+		requiresNetworkCIDR = false
+		requiresSubnetCIDR = false
+	}
 	if !optionTaken {
 		allErrs = append(allErrs, field.Required(fieldSpec.Child("cloudProvider"), ""))
 		requiresSubnets = false
@@ -329,6 +337,8 @@ func ValidateCluster(c *kops.Cluster, strict bool) field.ErrorList {
 			k8sCloudProvider = "openstack"
 		case kops.CloudProviderAzure:
 			k8sCloudProvider = "azure"
+		case kops.CloudProviderScaleway:
+			k8sCloudProvider = "external"
 		default:
 			// We already added an error above
 			k8sCloudProvider = "ignore"

pkg/model/components/apiserver.go

@@ -110,6 +110,8 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
 		c.CloudProvider = "openstack"
 	case kops.CloudProviderAzure:
 		c.CloudProvider = "azure"
+	case kops.CloudProviderScaleway:
+		c.CloudProvider = "external"
 	default:
 		return fmt.Errorf("unknown cloudprovider %q", clusterSpec.GetCloudProvider())
 	}

pkg/model/components/etcdmanager/model.go

@@ -39,6 +39,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/gce"
 	"k8s.io/kops/upup/pkg/fi/cloudup/hetzner"
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
+	"k8s.io/kops/upup/pkg/fi/cloudup/scaleway"
 	"k8s.io/kops/upup/pkg/fi/fitasks"
 	"k8s.io/kops/util/pkg/env"
 	"k8s.io/kops/util/pkg/exec"
@@ -440,6 +441,15 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
 			}
 			config.VolumeNameTag = openstack.TagNameEtcdClusterPrefix + etcdCluster.Name
 
+		case kops.CloudProviderScaleway:
+			config.VolumeProvider = "scaleway"
+
+			config.VolumeTag = []string{
+				fmt.Sprintf("%s=%s", scaleway.TagClusterName, b.Cluster.Name),
+				fmt.Sprintf("%s=%s", scaleway.TagNameEtcdClusterPrefix, etcdCluster.Name),
+				fmt.Sprintf("%s=%s", scaleway.TagNameRolePrefix, scaleway.TagRoleMaster),
+			}
+			config.VolumeNameTag = fmt.Sprintf("%s=%s", scaleway.TagInstanceGroup, instanceGroupName)
 		default:
 			return nil, fmt.Errorf("CloudProvider %q not supported with etcd-manager", b.Cluster.Spec.GetCloudProvider())
 		}

pkg/model/components/kubecontrollermanager.go

@@ -99,6 +99,9 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
 		case kops.CloudProviderAzure:
 			kcm.CloudProvider = "azure"
 
+		case kops.CloudProviderScaleway:
+			kcm.CloudProvider = "external"
+
 		default:
 			return fmt.Errorf("unknown cloudprovider %q", clusterSpec.GetCloudProvider())
 		}

pkg/model/components/kubelet.go

@@ -159,6 +159,10 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
 		clusterSpec.Kubelet.CloudProvider = "azure"
 	}
 
+	if cloudProvider == kops.CloudProviderScaleway {
+		clusterSpec.Kubelet.CloudProvider = "external"
+	}
+
 	if clusterSpec.ExternalCloudControllerManager != nil {
 		clusterSpec.Kubelet.CloudProvider = "external"
 	}

pkg/model/master_volumes.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-
+	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/apis/kops/model"
 	"k8s.io/kops/upup/pkg/fi"
@@ -38,6 +38,8 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/hetznertasks"
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstacktasks"
+	"k8s.io/kops/upup/pkg/fi/cloudup/scaleway"
+	"k8s.io/kops/upup/pkg/fi/cloudup/scalewaytasks"
 )
 
 const (
@@ -118,6 +120,8 @@ func (b *MasterVolumeBuilder) Build(c *fi.ModelBuilderContext) error {
 				if err != nil {
 					return err
 				}
+			case kops.CloudProviderScaleway:
+				b.addScalewayVolume(c, name, volumeSize, zone, etcd, m, allMembers)
 			default:
 				return fmt.Errorf("unknown cloudprovider %q", b.Cluster.Spec.GetCloudProvider())
 			}
@@ -392,3 +396,24 @@ func (b *MasterVolumeBuilder) addAzureVolume(
 
 	return nil
 }
+
+func (b *MasterVolumeBuilder) addScalewayVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd kops.EtcdClusterSpec, m kops.EtcdMemberSpec, allMembers []string) {
+	tags := []string{
+		fmt.Sprintf("%s=%s", scaleway.TagClusterName, b.Cluster.ObjectMeta.Name),
+		fmt.Sprintf("%s=%s", scaleway.TagNameEtcdClusterPrefix, etcd.Name),
+		fmt.Sprintf("%s=%s", scaleway.TagNameRolePrefix, scaleway.TagRoleMaster),
+		fmt.Sprintf("%s=%s", scaleway.TagInstanceGroup, fi.ValueOf(m.InstanceGroup)),
+	}
+
+	t := &scalewaytasks.Volume{
+		Name:      fi.PtrTo(name),
+		Lifecycle: b.Lifecycle,
+		Size:      fi.PtrTo(int64(volumeSize) * 1e9),
+		Zone:      &zone,
+		Tags:      tags,
+		Type:      fi.PtrTo(string(instance.VolumeVolumeTypeBSSD)),
+	}
+	c.AddTask(t)
+
+	return
+}

upup/pkg/fi/cloudup/new_cluster.go

@@ -348,6 +348,8 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
 			return nil, err
 		}
 		cloud = osCloud
+	case api.CloudProviderScaleway:
+		cluster.Spec.CloudProvider.Scaleway = &api.ScalewaySpec{}
 
 	default:
 		return nil, fmt.Errorf("unsupported cloud provider %s", opt.CloudProvider)
@@ -729,6 +731,11 @@ func setupZones(opt *NewClusterOptions, cluster *api.Cluster, allZones sets.Stri
 				return nil, err
 			}
 		}
+
+	case api.CloudProviderScaleway:
+		if len(opt.Zones) > 1 {
+			return nil, fmt.Errorf("scaleway cloud provider currently supports only one availability zone")
+		}
 	}
 
 	for _, zoneName := range allZones.List() {

upup/pkg/fi/cloudup/populate_instancegroup_spec.go

@@ -36,19 +36,21 @@ import (
 
 // Default Machine types for various types of instance group machine
 const (
-	defaultNodeMachineTypeGCE     = "e2-medium"
-	defaultNodeMachineTypeDO      = "s-2vcpu-4gb"
-	defaultNodeMachineTypeAzure   = "Standard_B2s"
-	defaultNodeMachineTypeHetzner = "cx21"
+	defaultNodeMachineTypeGCE      = "e2-medium"
+	defaultNodeMachineTypeDO       = "s-2vcpu-4gb"
+	defaultNodeMachineTypeAzure    = "Standard_B2s"
+	defaultNodeMachineTypeHetzner  = "cx21"
+	defaultNodeMachineTypeScaleway = "DEV1-M"
 
 	defaultBastionMachineTypeGCE     = "e2-micro"
 	defaultBastionMachineTypeAzure   = "Standard_B2s"
 	defaultBastionMachineTypeHetzner = "cx11"
 
-	defaultMasterMachineTypeGCE     = "e2-medium"
-	defaultMasterMachineTypeDO      = "s-2vcpu-4gb"
-	defaultMasterMachineTypeAzure   = "Standard_B2s"
-	defaultMasterMachineTypeHetzner = "cx21"
+	defaultMasterMachineTypeGCE      = "e2-medium"
+	defaultMasterMachineTypeDO       = "s-2vcpu-4gb"
+	defaultMasterMachineTypeAzure    = "Standard_B2s"
+	defaultMasterMachineTypeHetzner  = "cx21"
+	defaultMasterMachineTypeScaleway = "DEV1-M"
 
 	defaultDOImage       = "ubuntu-20-04-x64"
 	defaultHetznerImage  = "ubuntu-20.04"
@@ -362,6 +364,15 @@ func defaultMachineType(cloud fi.Cloud, cluster *kops.Cluster, ig *kops.Instance
 		case kops.InstanceGroupRoleBastion:
 			return defaultBastionMachineTypeAzure, nil
 		}
+
+	case kops.CloudProviderScaleway:
+		switch ig.Spec.Role {
+		case kops.InstanceGroupRoleControlPlane:
+			return defaultMasterMachineTypeScaleway, nil
+
+		case kops.InstanceGroupRoleNode:
+			return defaultNodeMachineTypeScaleway, nil
+		}
 	}
 
 	klog.V(2).Infof("Cannot set default MachineType for CloudProvider=%q, Role=%q", cluster.Spec.GetCloudProvider(), ig.Spec.Role)

upup/pkg/fi/cloudup/scaleway/cloud.go

@@ -35,10 +35,13 @@ import (
 )
 
 const (
-	TagClusterName      = "kops.k8s.io/cluster"
-	KopsUserAgentPrefix = "kubernetes-kops/"
-	TagInstanceGroup    = "instance-group"
-	TagNameRolePrefix   = "k8s.io/role/"
+	TagClusterName           = "kops.k8s.io/cluster"
+	KopsUserAgentPrefix      = "kubernetes-kops/"
+	TagInstanceGroup         = "instance-group"
+	TagNameRolePrefix        = "k8s.io/role"
+	TagNameEtcdClusterPrefix = "k8s.io/etcd"
+	TagRoleMaster            = "control-plane"
+	TagRoleVolume            = "volume"
 )
 
 // ScwCloud exposes all the interfaces required to operate on Scaleway resources
@@ -218,13 +221,13 @@ func (s *scwCloudImplementation) FindClusterStatus(cluster *kops.Cluster) (*kops
 
 // FindVPCInfo is not implemented yet, it's only here to satisfy the fi.Cloud interface
 func (s *scwCloudImplementation) FindVPCInfo(id string) (*fi.VPCInfo, error) {
-	klog.V(8).Info("Scaleway doesn't have a VPC yet so FindVPCInfo is not implemented")
+	klog.V(8).Info("Scaleway clusters don't have a VPC yet so FindVPCInfo is not implemented")
 	return nil, fmt.Errorf("FindVPCInfo is not implemented yet for Scaleway")
 }
 
 func (s *scwCloudImplementation) GetApiIngressStatus(cluster *kops.Cluster) ([]fi.ApiIngressStatus, error) {
-	klog.V(8).Info("Scaleway doesn't have load-balancers yet so GetApiIngressStatus is not implemented")
-	return nil, fmt.Errorf("GetApiIngressStatus is not implemented yet for Scaleway")
+	klog.V(8).Info("Scaleway clusters don't have load-balancers yet so GetApiIngressStatus is not implemented")
+	return nil, nil
 }
 
 func (s *scwCloudImplementation) GetCloudGroups(cluster *kops.Cluster, instancegroups []*kops.InstanceGroup, warnUnmatched bool, nodes []v1.Node) (map[string]*cloudinstances.CloudInstanceGroup, error) {

upup/pkg/fi/cloudup/scalewaytasks/instance.go

@@ -75,6 +75,37 @@ func (s *Instance) Run(c *fi.Context) error {
 	return fi.DefaultDeltaRunMethod(s, c)
 }
 
+func (_ *Instance) CheckChanges(actual, expected, changes *Instance) error {
+	if actual != nil {
+		if changes.Name != nil {
+			return fi.CannotChangeField("Name")
+		}
+		if changes.Zone != nil {
+			return fi.CannotChangeField("Zone")
+		}
+		if changes.CommercialType != nil {
+			return fi.CannotChangeField("CommercialType")
+		}
+		if changes.Image != nil {
+			return fi.CannotChangeField("Image")
+		}
+	} else {
+		if expected.Name == nil {
+			return fi.RequiredField("Name")
+		}
+		if expected.Zone == nil {
+			return fi.RequiredField("Zone")
+		}
+		if expected.CommercialType == nil {
+			return fi.RequiredField("CommercialType")
+		}
+		if expected.Image == nil {
+			return fi.RequiredField("Image")
+		}
+	}
+	return nil
+}
+
 func (_ *Instance) RenderScw(c *fi.Context, actual, expected, changes *Instance) error {
 	cloud := c.Cloud.(scaleway.ScwCloud)
 	instanceService := cloud.InstanceService()
@@ -167,34 +198,3 @@ func (_ *Instance) RenderScw(c *fi.Context, actual, expected, changes *Instance)
 
 	return nil
 }
-
-func (_ *Instance) CheckChanges(actual, expected, changes *Instance) error {
-	if actual != nil {
-		if changes.Name != nil {
-			return fi.CannotChangeField("Name")
-		}
-		if changes.Zone != nil {
-			return fi.CannotChangeField("Zone")
-		}
-		if changes.CommercialType != nil {
-			return fi.CannotChangeField("CommercialType")
-		}
-		if changes.Image != nil {
-			return fi.CannotChangeField("Image")
-		}
-	} else {
-		if expected.Name == nil {
-			return fi.RequiredField("Name")
-		}
-		if expected.Zone == nil {
-			return fi.RequiredField("Zone")
-		}
-		if expected.CommercialType == nil {
-			return fi.RequiredField("CommercialType")
-		}
-		if expected.Image == nil {
-			return fi.RequiredField("Image")
-		}
-	}
-	return nil
-}

upup/pkg/fi/cloudup/scalewaytasks/sshkey.go

@@ -108,36 +108,35 @@ func (s *SSHKey) CheckChanges(actual, expected, changes *SSHKey) error {
 }
 
 func (*SSHKey) RenderScw(c *fi.Context, actual, expected, changes *SSHKey) error {
-	cloud := c.Cloud.(scaleway.ScwCloud)
-
-	if actual == nil {
+	if actual != nil {
+		klog.Infof("Scaleway does not support changes to ssh keys for the moment")
+		return nil
+	}
 
-		name := fi.ValueOf(expected.Name)
-		if name == "" {
-			return fi.RequiredField("Name")
-		}
-		klog.V(2).Infof("Creating keypair with name: %q", name)
+	cloud := c.Cloud.(scaleway.ScwCloud)
 
-		keyArgs := &account.CreateSSHKeyRequest{
-			Name: name,
-		}
-		if expected.PublicKey != nil {
-			d, err := fi.ResourceAsString(*expected.PublicKey)
-			if err != nil {
-				return fmt.Errorf("error rendering SSH public key: %w", err)
-			}
-			keyArgs.PublicKey = d
-		}
+	name := fi.ValueOf(expected.Name)
+	if name == "" {
+		return fi.RequiredField("Name")
+	}
+	klog.V(2).Infof("Creating keypair with name: %q", name)
 
-		key, err := cloud.AccountService().CreateSSHKey(keyArgs)
+	keyArgs := &account.CreateSSHKeyRequest{
+		Name: name}
+	if expected.PublicKey != nil {
+		d, err := fi.ResourceAsString(*expected.PublicKey)
 		if err != nil {
-			return fmt.Errorf("error creating SSH keypair: %w", err)
+			return fmt.Errorf("error rendering SSH public key: %w", err)
 		}
-		expected.KeyPairFingerPrint = fi.PtrTo(key.Fingerprint)
-		klog.V(2).Infof("Created a new SSH keypair, id=%q fingerprint=%q", key.ID, key.Fingerprint)
+		keyArgs.PublicKey = d
+	}
 
-		return nil
+	key, err := cloud.AccountService().CreateSSHKey(keyArgs)
+	if err != nil {
+		return fmt.Errorf("error creating SSH keypair: %w", err)
 	}
+	expected.KeyPairFingerPrint = fi.PtrTo(key.Fingerprint)
+	klog.V(2).Infof("Created a new SSH keypair, id=%q fingerprint=%q", key.ID, key.Fingerprint)
 
 	return nil
 }