Merge pull request #6 from hanweisen/main

create ippool use GlobalCIDRsMap
kosmos-io · Aug 31, 2023 · d5548df · d5548df
2 parents 93e9fe8 + b6a5c93
commit d5548df
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/pkg/controllers/calicoippool/calicoippool_controller.go b/pkg/controllers/calicoippool/calicoippool_controller.go
@@ -341,22 +341,29 @@ func (c *Controller) Reconcile(key utils.QueueKey) error {
  delete(c.globalExtIPPoolSet, ipPool)
  }
  }
-
+ getCIDR := func(cidr string, cidrMap map[string]string) string {
+ if c, exist := cidrMap[cidr]; exist {
+ return c
+ } else {
+ return cidr
+ }
+ }
+ cidrMap := cluster.Spec.GlobalCIDRsMap
  podCIDRS := cluster.Status.PodCIDRs
  serviceCIDR := cluster.Status.ServiceCIDRs
  for _, cidr := range podCIDRS {
  extIPPool := ExternalClusterIPPool{
  cluster: cluster.Name,
  ipType: PODIPType,
- ipPool: cidr,
+ ipPool: getCIDR(cidr, cidrMap),
  }
  c.globalExtIPPoolSet[extIPPool] = struct{}{}
  }
  for _, cidr := range serviceCIDR {
  extIPPool := ExternalClusterIPPool{
  cluster: cluster.Name,
  ipType: SERVICEIPType,
- ipPool: cidr,
+ ipPool: getCIDR(cidr, cidrMap),
  }
  c.globalExtIPPoolSet[extIPPool] = struct{}{}
  }