Merge pull request #647 from yvetteli0314/master

Add syncDefaultPodRanges change for Multi-networking default Param an…

Author: k8s-ci-robot

cmd/cloud-controller-manager/gkenetworkparamsetcontroller.go

@@ -3,12 +3,14 @@ package main
 import (
 	"context"
 	"fmt"
+	"net"
 	"time"
 
 	cloudprovider "k8s.io/cloud-provider"
 	networkclientset "k8s.io/cloud-provider-gcp/crd/client/network/clientset/versioned"
 	networkinformers "k8s.io/cloud-provider-gcp/crd/client/network/informers/externalversions"
 	gkenetworkparamsetcontroller "k8s.io/cloud-provider-gcp/pkg/controller/gkenetworkparamset"
+	"k8s.io/cloud-provider-gcp/pkg/controller/nodeipam/ipam"
 	"k8s.io/cloud-provider-gcp/providers/gce"
 	"k8s.io/cloud-provider/app"
 	cloudcontrollerconfig "k8s.io/cloud-provider/app/config"
@@ -40,18 +42,50 @@ func startGkeNetworkParamsController(ccmConfig *cloudcontrollerconfig.CompletedC
 		return nil, false, err
 	}
 
+	// the CloudAllocator needs cluster cidrs for default GNP
+	clusterCIDRs := []*net.IPNet{}
+	if ipam.CIDRAllocatorType(ccmConfig.ComponentConfig.KubeCloudShared.CIDRAllocatorType) == ipam.CloudAllocatorType {
+		clusterCIDRs, err = validClusterCIDR(ccmConfig.ComponentConfig.KubeCloudShared.ClusterCIDR)
+		if err != nil {
+			return nil, false, err
+		}
+	}
+
 	nwInfFactory := networkinformers.NewSharedInformerFactory(networkClient, 30*time.Second)
 	nwInformer := nwInfFactory.Networking().V1().Networks()
 	gnpInformer := nwInfFactory.Networking().V1().GKENetworkParamSets()
 
 	gkeNetworkParamsetController := gkenetworkparamsetcontroller.NewGKENetworkParamSetController(
+		controllerCtx.InformerFactory.Core().V1().Nodes(),
 		networkClient,
 		gnpInformer,
 		nwInformer,
 		gceCloud,
 		nwInfFactory,
+		clusterCIDRs,
 	)
 
 	go gkeNetworkParamsetController.Run(1, controllerCtx.Stop, controllerCtx.ControllerManagerMetrics)
 	return nil, true, nil
 }
+
+// validClusterCIDR process CIDR form config and validates the cluster CIDR
+// with stack type and returns a list of typed cidrs and error
+func validClusterCIDR(clusterCIDRFromFlag string) ([]*net.IPNet, error) {
+	// failure: bad cidrs in config
+	clusterCIDRs, dualStack, err := processCIDRs(clusterCIDRFromFlag)
+	if err != nil {
+		return nil, err
+	}
+
+	// failure: more than one cidr but they are not configured as dual stack
+	if len(clusterCIDRs) > 1 && !dualStack {
+		return nil, fmt.Errorf("len of ClusterCIDRs==%v and they are not configured as dual stack (at least one from each IPFamily", len(clusterCIDRs))
+	}
+
+	// failure: more than cidrs is not allowed even with dual stack
+	if len(clusterCIDRs) > 2 {
+		return nil, fmt.Errorf("len of clusters is:%v > more than max allowed of 2", len(clusterCIDRs))
+	}
+	return clusterCIDRs, nil
+}

go.mod

@@ -28,15 +28,15 @@ require (
 	k8s.io/kubelet v0.29.0
 	k8s.io/metrics v0.29.0
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
-	sigs.k8s.io/controller-tools v0.12.0
+	sigs.k8s.io/controller-tools v0.13.0
 )
 
 require (
 	cloud.google.com/go/compute/metadata v0.2.3
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/natefinch/atomic v1.0.1
 	k8s.io/cloud-provider v0.29.0
-	k8s.io/cloud-provider-gcp/crd v0.0.0-20230608185813-17ff4d5f2987
+	k8s.io/cloud-provider-gcp/crd v0.0.0-20231206221110-9fb2d417fa43
 	k8s.io/cloud-provider-gcp/providers v0.0.0-00010101000000-000000000000
 	k8s.io/kubernetes v1.29.0
 )

go.sum

@@ -539,8 +539,8 @@ k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8=
 k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38=
 k8s.io/cloud-provider v0.29.0 h1:Qgk/jHsSKGRk/ltTlN6e7eaNuuamLROOzVBd0RPp94M=
 k8s.io/cloud-provider v0.29.0/go.mod h1:gBCt7YYKFV4oUcJ/0xF9lS/9il4MxKunJ+ZKvh39WGo=
-k8s.io/cloud-provider-gcp/crd v0.0.0-20230608185813-17ff4d5f2987 h1:tnvHnW8RW2knxRIa0Z1x1WFafKiRz4Y6tcD8N1rlLNg=
-k8s.io/cloud-provider-gcp/crd v0.0.0-20230608185813-17ff4d5f2987/go.mod h1:cZ2yOeXgSgSwuFDLXYX28FVLOOC99fTjuAMyVrsLTYs=
+k8s.io/cloud-provider-gcp/crd v0.0.0-20231206221110-9fb2d417fa43 h1:cjM5PnhRbAWMbiz7Lr59B+t5vGSOqQVVJVdCysZvPI8=
+k8s.io/cloud-provider-gcp/crd v0.0.0-20231206221110-9fb2d417fa43/go.mod h1:a0fK8UZd7VumJ457hG1t4Mj4Y2tUdLi68po7kwktyZQ=
 k8s.io/code-generator v0.29.0 h1:2LQfayGDhaIlaamXjIjEQlCMy4JNCH9lrzas4DNW1GQ=
 k8s.io/code-generator v0.29.0/go.mod h1:5bqIZoCxs2zTRKMWNYqyQWW/bajc+ah4rh0tMY8zdGA=
 k8s.io/component-base v0.29.0 h1:T7rjd5wvLnPBV1vC4zWd/iWRbV8Mdxs+nGaoaFzGw3s=
@@ -570,8 +570,8 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
-sigs.k8s.io/controller-tools v0.12.0 h1:TY6CGE6+6hzO7hhJFte65ud3cFmmZW947jajXkuDfBw=
-sigs.k8s.io/controller-tools v0.12.0/go.mod h1:rXlpTfFHZMpZA8aGq9ejArgZiieHd+fkk/fTatY8A2M=
+sigs.k8s.io/controller-tools v0.13.0 h1:NfrvuZ4bxyolhDBt/rCZhDnx3M2hzlhgo5n3Iv2RykI=
+sigs.k8s.io/controller-tools v0.13.0/go.mod h1:5vw3En2NazbejQGCeWKRrE7q4P+CW8/klfVqP8QZkgA=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

pkg/controller/gkenetworkparamset/BUILD

@@ -11,16 +11,20 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/controllermetrics",
+        "//pkg/util/node",
         "//providers/gce",
         "//vendor/github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud",
         "//vendor/github.com/hashicorp/go-multierror",
         "//vendor/google.golang.org/api/compute/v1:compute",
+        "//vendor/k8s.io/api/core/v1:core",
         "//vendor/k8s.io/apimachinery/pkg/api/errors",
         "//vendor/k8s.io/apimachinery/pkg/api/meta",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:meta",
         "//vendor/k8s.io/apimachinery/pkg/labels",
         "//vendor/k8s.io/apimachinery/pkg/util/runtime",
         "//vendor/k8s.io/apimachinery/pkg/util/wait",
+        "//vendor/k8s.io/client-go/informers/core/v1:core",
+        "//vendor/k8s.io/client-go/listers/core/v1:core",
         "//vendor/k8s.io/client-go/tools/cache",
         "//vendor/k8s.io/client-go/util/workqueue",
         "//vendor/k8s.io/cloud-provider-gcp/crd/apis/network/v1:network",
@@ -31,6 +35,8 @@ go_library(
         "//vendor/k8s.io/component-base/metrics/legacyregistry",
         "//vendor/k8s.io/component-base/metrics/prometheus/controllers",
         "//vendor/k8s.io/klog/v2:klog",
+        "//vendor/k8s.io/utils/net",
+        "//vendor/k8s.io/utils/strings/slices",
     ],
 )
 
@@ -39,14 +45,20 @@ go_test(
     srcs = ["gkenetworkparamset_controller_test.go"],
     embed = [":gkenetworkparamset"],
     deps = [
+        "//pkg/util/node",
         "//providers/gce",
         "//vendor/github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta",
+        "//vendor/github.com/google/go-cmp/cmp",
         "//vendor/github.com/onsi/gomega",
         "//vendor/github.com/onsi/gomega/types",
         "//vendor/google.golang.org/api/compute/v1:compute",
+        "//vendor/k8s.io/api/core/v1:core",
         "//vendor/k8s.io/apimachinery/pkg/api/errors",
         "//vendor/k8s.io/apimachinery/pkg/api/meta",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:meta",
+        "//vendor/k8s.io/client-go/informers",
+        "//vendor/k8s.io/client-go/kubernetes/fake",
+        "//vendor/k8s.io/client-go/tools/cache",
         "//vendor/k8s.io/cloud-provider-gcp/crd/apis/network/v1:network",
         "//vendor/k8s.io/cloud-provider-gcp/crd/client/network/clientset/versioned/fake",
         "//vendor/k8s.io/cloud-provider-gcp/crd/client/network/informers/externalversions",