CON-12387 Ensure NLB is the default loadbalancer in DO CCM (#830)

Author: llDrLove

cloud-controller-manager/do/certificates_test.go

@@ -126,6 +126,7 @@ func createService(lbID string) *v1.Service {
 			Annotations: map[string]string{
 				annDOProtocol:       "http",
 				annDOLoadBalancerID: lbID,
+				annDOType:           godo.LoadBalancerTypeRegional,
 			},
 		},
 		Spec: v1.ServiceSpec{

cloud-controller-manager/do/firewall_controller_test.go

@@ -359,6 +359,9 @@ func TestFirewallController_createReconciledFirewallRequest(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "lbServiceType",
 						UID:  "abc12345",
+						Annotations: map[string]string{
+							annDOType: godo.LoadBalancerTypeRegional,
+						},
 					},
 					Spec: v1.ServiceSpec{
 						Type: v1.ServiceTypeLoadBalancer,

cloud-controller-manager/do/loadbalancers.go

@@ -1427,7 +1427,7 @@ func getDisownLB(service *v1.Service) (bool, error) {
 func getType(service *v1.Service) (string, error) {
 	name, ok := service.Annotations[annDOType]
 	if !ok || name == "" {
-		return godo.LoadBalancerTypeRegional, nil
+		return godo.LoadBalancerTypeRegionalNetwork, nil
 	}
 	if !(name == godo.LoadBalancerTypeRegional || name == godo.LoadBalancerTypeRegionalNetwork) {
 		return "", fmt.Errorf("only LB types supported are (%s, %s)", godo.LoadBalancerTypeRegional, godo.LoadBalancerTypeRegionalNetwork)

cloud-controller-manager/do/loadbalancers_test.go

@@ -3647,6 +3647,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 					UID:  "foobar123",
 					Annotations: map[string]string{
 						annDOProtocol: "http",
+						annDOType:     godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -3725,6 +3726,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 					Annotations: map[string]string{
 						annDOProtocol:      "http2",
 						annDOCertificateID: "test-certificate",
+						annDOType:          godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -3803,6 +3805,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 					Annotations: map[string]string{
 						annDOProtocol:      "http2",
 						annDOCertificateID: "test-certificate",
+						annDOType:          godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -3892,6 +3895,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 					UID:  "foobar123",
 					Annotations: map[string]string{
 						annDOOverrideHealthCheck: "",
+						annDOType:                godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -3949,6 +3953,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 						annDOProtocol:            "tcp",
 						annDOHealthCheckPath:     "/health",
 						annDOHealthCheckProtocol: "http",
+						annDOType:                godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -4027,6 +4032,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 					Annotations: map[string]string{
 						annDOProtocol:  "http",
 						annDOAlgorithm: "least_connections",
+						annDOType:      godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -4105,6 +4111,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 					Annotations: map[string]string{
 						annDOProtocol: "http",
 						annDOSizeSlug: "lb-medium",
+						annDOType:     godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -4184,6 +4191,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 					Annotations: map[string]string{
 						annDOProtocol: "http",
 						annDOSizeUnit: "2",
+						annDOType:     godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -4322,6 +4330,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 						annDOStickySessionsType:       "cookies",
 						annDOStickySessionsCookieName: "DO-CCM",
 						annDOStickySessionsCookieTTL:  "300",
+						annDOType:                     godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -4405,6 +4414,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 						annDOStickySessionsType:       "cookies",
 						annDOStickySessionsCookieName: "DO-CCM",
 						annDOStickySessionsCookieTTL:  "300",
+						annDOType:                     godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -4488,6 +4498,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 						annDORedirectHTTPToHTTPS: "true",
 						annDOTLSPorts:            "443",
 						annDOCertificateID:       "test-certificate",
+						annDOType:                godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -4582,6 +4593,7 @@ func Test_buildLoadBalancerRequest(t *testing.T) {
 						annDOTLSPorts:                     "443",
 						annDOCertificateID:                "test-certificate",
 						annDODisableLetsEncryptDNSRecords: "true",
+						annDOType:                         godo.LoadBalancerTypeRegional,
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -6244,7 +6256,7 @@ func Test_getType(t *testing.T) {
 		expectedType *string
 	}{
 		{
-			name: "no value defaults to REGIONAL",
+			name: "no value defaults to REGIONAL_NETWORK",
 			service: &v1.Service{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:        "test",
@@ -6253,7 +6265,7 @@ func Test_getType(t *testing.T) {
 				},
 			},
 			wantErr:      false,
-			expectedType: &regional,
+			expectedType: &regionalNetwork,
 		}, {
 			name: "annotation set to REGIONAL",
 			service: &v1.Service{

envtest/lb_admission_test.go

@@ -227,6 +227,7 @@ func fakeService(annotations map[string]string, spec *corev1.ServiceSpec) *corev
 		annotations = make(map[string]string)
 	}
 	annotations["kubernetes.digitalocean.com/load-balancer-id"] = lbID
+	annotations["service.beta.kubernetes.io/do-loadbalancer-type"] = godo.LoadBalancerTypeRegional
 	annotations["service.beta.kubernetes.io/do-loadbalancer-name"] = serviceName
 	return &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{