metadata: move subnetCIDR to InstanceMetadata

bootstrapper/internal/kubernetes/cloud_provider.go

@@ -23,8 +23,6 @@ type ProviderMetadata interface {
 	List(ctx context.Context) ([]metadata.InstanceMetadata, error)
 	// Self retrieves the current instance.
 	Self(ctx context.Context) (metadata.InstanceMetadata, error)
-	// GetSubnetworkCIDR retrieves the subnetwork CIDR for the current instance.
-	GetSubnetworkCIDR(ctx context.Context) (string, error)
 	// GetLoadBalancerEndpoint retrieves the load balancer endpoint.
 	GetLoadBalancerEndpoint(ctx context.Context) (string, error)
 	// GetInstance retrieves an instance using its providerID.
@@ -92,9 +90,6 @@ type stubProviderMetadata struct {
 	GetLoadBalancerEndpointErr  error
 	GetLoadBalancerEndpointResp string
 
-	GetSubnetworkCIDRErr  error
-	GetSubnetworkCIDRResp string
-
 	ListErr  error
 	ListResp []metadata.InstanceMetadata
 
@@ -115,10 +110,6 @@ func (m *stubProviderMetadata) GetLoadBalancerEndpoint(ctx context.Context) (str
 	return m.GetLoadBalancerEndpointResp, m.GetLoadBalancerEndpointErr
 }
 
-func (m *stubProviderMetadata) GetSubnetworkCIDR(ctx context.Context) (string, error) {
-	return m.GetSubnetworkCIDRResp, m.GetSubnetworkCIDRErr
-}
-
 func (m *stubProviderMetadata) List(ctx context.Context) ([]metadata.InstanceMetadata, error) {
 	return m.ListResp, m.ListErr
 }

bootstrapper/internal/kubernetes/kubernetes.go

@@ -120,15 +120,11 @@ func (k *KubeWrapper) InitCluster(
 		nodeName = k8sCompliantHostname(instance.Name)
 		providerID = instance.ProviderID
 		nodeIP = instance.VPCIP
+		subnetworkPodCIDR = instance.SubnetworkCIDR
 
 		if len(instance.AliasIPRanges) > 0 {
 			nodePodCIDR = instance.AliasIPRanges[0]
 		}
-		subnetworkPodCIDR, err = k.providerMetadata.GetSubnetworkCIDR(ctx)
-		if err != nil {
-			return nil, fmt.Errorf("retrieving subnetwork CIDR: %w", err)
-		}
-
 		controlPlaneEndpoint, err = k.providerMetadata.GetLoadBalancerEndpoint(ctx)
 		if err != nil {
 			return nil, fmt.Errorf("retrieving load balancer endpoint: %w", err)

bootstrapper/internal/kubernetes/kubernetes_test.go

@@ -129,20 +129,6 @@ func TestInitCluster(t *testing.T) {
 			wantErr:                true,
 			k8sVersion:             versions.Default,
 		},
-		"kubeadm init fails when retrieving metadata subnetwork cidr": {
-			clusterUtil: stubClusterUtil{},
-			kubeconfigReader: &stubKubeconfigReader{
-				Kubeconfig: []byte("someKubeconfig"),
-			},
-			providerMetadata: &stubProviderMetadata{
-				GetSubnetworkCIDRErr: someErr,
-				SupportedResp:        true,
-			},
-			CloudControllerManager: &stubCloudControllerManager{},
-			ClusterAutoscaler:      &stubClusterAutoscaler{},
-			wantErr:                true,
-			k8sVersion:             versions.Default,
-		},
 		"kubeadm init fails when retrieving metadata loadbalancer ip": {
 			clusterUtil: stubClusterUtil{},
 			kubeconfigReader: &stubKubeconfigReader{