Add support for IPMode

Closes digitalocean#756

Author: simonhammes

cloud-controller-manager/do/loadbalancers.go

@@ -149,6 +149,7 @@ func (l *loadBalancers) GetLoadBalancer(ctx context.Context, clusterName string,
 		Ingress: []v1.LoadBalancerIngress{
 			{
 				IP: lb.IP,
+				// TODO: Should this include IPMode?
 			},
 		},
 	}, true, nil
@@ -244,10 +245,22 @@ func (l *loadBalancers) EnsureLoadBalancer(ctx context.Context, clusterName stri
 		}, nil
 	}
 
+	ipMode := v1.LoadBalancerIPModeVIP
+
+	enableProxyProtocol, err := getEnableProxyProtocol(service)
+	if err != nil {
+		return nil, err
+	}
+
+	if enableProxyProtocol {
+		ipMode = v1.LoadBalancerIPModeProxy
+	}
+
 	return &v1.LoadBalancerStatus{
 		Ingress: []v1.LoadBalancerIngress{
 			{
-				IP: lb.IP,
+				IP:     lb.IP,
+				IPMode: &ipMode,
 			},
 		},
 	}, nil

cloud-controller-manager/do/loadbalancers_test.go

@@ -5239,6 +5239,8 @@ func Test_GetLoadBalancer(t *testing.T) {
 }
 
 func Test_EnsureLoadBalancer(t *testing.T) {
+	ipModeVIP := v1.LoadBalancerIPModeVIP
+
 	testcases := []struct {
 		name              string
 		droplets          []godo.Droplet
@@ -5319,7 +5321,8 @@ func Test_EnsureLoadBalancer(t *testing.T) {
 			lbStatus: &v1.LoadBalancerStatus{
 				Ingress: []v1.LoadBalancerIngress{
 					{
-						IP: "10.0.0.1",
+						IP:     "10.0.0.1",
+						IPMode: &ipModeVIP,
 					},
 				},
 			},
@@ -5393,7 +5396,8 @@ func Test_EnsureLoadBalancer(t *testing.T) {
 			lbStatus: &v1.LoadBalancerStatus{
 				Ingress: []v1.LoadBalancerIngress{
 					{
-						IP: "10.0.0.1",
+						IP:     "10.0.0.1",
+						IPMode: &ipModeVIP,
 					},
 				},
 			},
@@ -5466,7 +5470,8 @@ func Test_EnsureLoadBalancer(t *testing.T) {
 			lbStatus: &v1.LoadBalancerStatus{
 				Ingress: []v1.LoadBalancerIngress{
 					{
-						IP: "10.0.0.1",
+						IP:     "10.0.0.1",
+						IPMode: &ipModeVIP,
 					},
 				},
 			},
@@ -5543,7 +5548,8 @@ func Test_EnsureLoadBalancer(t *testing.T) {
 			lbStatus: &v1.LoadBalancerStatus{
 				Ingress: []v1.LoadBalancerIngress{
 					{
-						IP: "10.0.0.1",
+						IP:     "10.0.0.1",
+						IPMode: &ipModeVIP,
 					},
 				},
 			},
@@ -5640,7 +5646,8 @@ func Test_EnsureLoadBalancer(t *testing.T) {
 			lbStatus: &v1.LoadBalancerStatus{
 				Ingress: []v1.LoadBalancerIngress{
 					{
-						IP: "10.0.0.1",
+						IP:     "10.0.0.1",
+						IPMode: nil,
 					},
 				},
 			},