Merge pull request #8 from jtherin/lbtype

feat: loadbalancer type

Author: jtherin

docs/loadbalancer-annotations.md

@@ -40,6 +40,7 @@ You can get a list of working annotation on in the Scaleway loadBalancer [docume
 | `service.beta.kubernetes.io/scw-loadbalancer-timeout-server` | maximum server connection inactivity time |
 | `service.beta.kubernetes.io/scw-loadbalancer-timeout-connect` | maximum initical server connection establishment time |
 | `service.beta.kubernetes.io/scw-loadbalancer-timeout-tunnel` | maximum tunnel inactivity time |
+| `service.beta.kubernetes.io/scw-loadbalancer-type` | load balancer offer type (lb-s, lb-gp-m, lb-gp-l). default: lb-s |
 | `service.beta.kubernetes.io/scw-loadbalancer-on-marked-down-action` | annotation that modifes what occurs when a backend server is marked down |
 
 Note:

go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/google/uuid v1.1.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200218181456-569954793561
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200312094438-4e477f6a5660
 	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
 	k8s.io/api v0.17.0
 	k8s.io/apiextensions-apiserver v0.17.0

go.sum

@@ -445,6 +445,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200218180619-1c73f378abe6/
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200218181456-569954793561 h1:PdDKsvtaFtnZ8q/qXKFYblva163Qs+GNLezLThSap00=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200218181456-569954793561/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6 h1:C1/pvkxkGN/H03mDxLzItaceYJDBk1HdClgR15suAzI=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200312094438-4e477f6a5660 h1:CVB+9PJ7TYbEJEna6tjJ6IFHWxpi44KleG/BxvnkV90=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200312094438-4e477f6a5660/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=

scaleway/loadbalancers.go

@@ -103,6 +103,9 @@ const (
 	// (for instance "80,443")
 	serviceAnnotationLoadBalancerProxyProtocolV2 = "service.beta.kubernetes.io/scw-loadbalancer-proxy-protocol-v2"
 
+	// serviceAnnotationLoadBalancerType is the load balancer offer type
+	serviceAnnotationLoadBalancerType = "service.beta.kubernetes.io/scw-loadbalancer-type"
+
 	// serviceAnnotationLoadBalancerTimeoutServer is the maximum server connection inactivity time
 	// The default value is "10m". The duration are go's time.Duration (ex: "1s", "2m", "4h", ...)
 	serviceAnnotationLoadBalancerTimeoutServer = "service.beta.kubernetes.io/scw-loadbalancer-timeout-server"
@@ -138,6 +141,7 @@ type LoadBalancerAPI interface {
 	GetLb(req *scwlb.GetLbRequest, opts ...scw.RequestOption) (*scwlb.Lb, error)
 	CreateLb(req *scwlb.CreateLbRequest, opts ...scw.RequestOption) (*scwlb.Lb, error)
 	DeleteLb(req *scwlb.DeleteLbRequest, opts ...scw.RequestOption) error
+	MigrateLb(req *scwlb.MigrateLbRequest, opts ...scw.RequestOption) (*scwlb.Lb, error)
 	ListIPs(req *scwlb.ListIPsRequest, opts ...scw.RequestOption) (*scwlb.ListIPsResponse, error)
 	ListBackends(req *scwlb.ListBackendsRequest, opts ...scw.RequestOption) (*scwlb.ListBackendsResponse, error)
 	CreateBackend(req *scwlb.CreateBackendRequest, opts ...scw.RequestOption) (*scwlb.Backend, error)
@@ -467,6 +471,7 @@ func (l *loadbalancers) createLoadBalancer(ctx context.Context, clusterName stri
 		Description: "kubernetes service " + service.Name,
 		Tags:        tags,
 		IPID:        ipID,
+		Type:        getLoadBalancerType(service),
 	}
 
 	lb, err := l.api.CreateLb(&request)
@@ -729,6 +734,22 @@ func (l *loadbalancers) updateLoadBalancer(ctx context.Context, loadbalancer *sc
 		}
 	}
 
+	loadBalancerType := getLoadBalancerType(service)
+	if loadBalancerType != "" && strings.ToLower(loadbalancer.Type) != strings.ToLower(loadBalancerType) {
+		_, err := l.api.MigrateLb(&scwlb.MigrateLbRequest{
+			LbID: loadbalancer.ID,
+			Type: loadBalancerType,
+		})
+		if err != nil {
+			klog.Errorf("error updating lb: %v", err)
+			var respErr *scw.ResponseError
+			if xerrors.As(err, &respErr) {
+				return fmt.Errorf("Unable to migrate loadbalancer %s error %d with message %s", loadbalancer.ID, respErr.StatusCode, respErr.Message)
+			}
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -1128,6 +1149,10 @@ func isPortInRange(r string, p int32) (bool, error) {
 	return false, nil
 }
 
+func getLoadBalancerType(service *v1.Service) string {
+	return service.Annotations[serviceAnnotationLoadBalancerType]
+}
+
 func getProxyProtocol(service *v1.Service, nodePort int32) (scwlb.ProxyProtocol, error) {
 	proxyProtocolV1 := service.Annotations[serviceAnnotationLoadBalancerProxyProtocolV1]
 	proxyProtocolV2 := service.Annotations[serviceAnnotationLoadBalancerProxyProtocolV2]