fixup! fix: let CAPI default Service CIDR

Author: dkoshkin

api/v1alpha1/constants.go

@@ -40,7 +40,4 @@ const (
 	DNSVariableName = "dns"
 
 	ClusterUUIDAnnotationKey = APIGroup + "/cluster-uuid"
-
-	// DefaultServicesSubnet defines default service subnet range used by kubeadm in CAPI
-	DefaultServicesSubnet = "10.96.0.0/12"
 )

pkg/handlers/generic/lifecycle/registry/utils/ip.go

@@ -9,8 +9,6 @@ import (
 
 	netutils "k8s.io/utils/net"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 )
 
 const ipIndex = 20
@@ -29,10 +27,6 @@ func ServiceIPForCluster(cluster *clusterv1.Cluster) (string, error) {
 }
 
 func getServiceIP(serviceSubnetStrings []string) (string, error) {
-	if len(serviceSubnetStrings) == 0 {
-		serviceSubnetStrings = []string{v1alpha1.DefaultServicesSubnet}
-	}
-
 	serviceSubnets, err := netutils.ParseCIDRs(serviceSubnetStrings)
 	if err != nil {
 		return "", fmt.Errorf("unable to parse service Subnets: %w", err)

pkg/handlers/generic/lifecycle/registry/utils/ip_test.go

@@ -4,6 +4,7 @@
 package utils
 
 import (
+	"errors"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -17,6 +18,7 @@ func Test_ServiceIPForCluster(t *testing.T) {
 		name    string
 		cluster *clusterv1.Cluster
 		want    string
+		wantErr error
 	}{
 		{
 			name: "Cluster with nil service CIDR",
@@ -25,7 +27,7 @@ func Test_ServiceIPForCluster(t *testing.T) {
 					ClusterNetwork: &clusterv1.ClusterNetwork{},
 				},
 			},
-			want: "10.96.0.20",
+			wantErr: errors.New("error getting a service IP for a cluster: unexpected empty service Subnets"),
 		},
 		{
 			name: "Cluster with empty service CIDR slice",
@@ -38,7 +40,7 @@ func Test_ServiceIPForCluster(t *testing.T) {
 					},
 				},
 			},
-			want: "10.96.0.20",
+			wantErr: errors.New("error getting a service IP for a cluster: unexpected empty service Subnets"),
 		},
 		{
 			name: "Cluster with a single service CIDR",
@@ -76,7 +78,11 @@ func Test_ServiceIPForCluster(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			got, err := ServiceIPForCluster(tt.cluster)
-			require.NoError(t, err)
+			if tt.wantErr != nil {
+				require.EqualError(t, err, tt.wantErr.Error())
+			} else {
+				require.NoError(t, err)
+			}
 			assert.Equal(t, tt.want, got)
 		})
 	}