fix coordinator webhook (#2284)

Signed-off-by: Icarus9913 <icaruswu66@qq.com>
spidernet-io · Aug 31, 2023 · 095c4f2 · 095c4f2
1 parent 99e8fe7
commit 095c4f2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/api/v1/agent/openapi.yaml b/api/v1/agent/openapi.yaml
@@ -333,9 +333,9 @@ definitions:
         items:
           type: string
     required:
-      - mode
       - overlayPodCIDR
       - serviceCIDR
+      - mode
       - tunePodRoutes
   GetCoordinatorArgs:
     description: Get Coordinator Args

diff --git a/api/v1/agent/server/embedded_spec.go b/api/v1/agent/server/embedded_spec.go
diff --git a/cmd/spiderpool-agent/cmd/coordinator.go b/cmd/spiderpool-agent/cmd/coordinator.go
@@ -91,5 +91,13 @@ func (g *_unixGetCoordinatorConfig) Handle(params daemonset.GetCoordinatorConfig
 		DetectIPConflict:   *coord.Spec.DetectIPConflict,
 		PodNICs:            spNics,
 	}
+
+	if config.OverlayPodCIDR == nil {
+		config.OverlayPodCIDR = []string{}
+	}
+	if config.ServiceCIDR == nil {
+		config.OverlayPodCIDR = []string{}
+	}
+
 	return daemonset.NewGetCoordinatorConfigOK().WithPayload(config)
 }
diff --git a/pkg/coordinatormanager/coordinator_validate.go b/pkg/coordinatormanager/coordinator_validate.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"k8s.io/utils/strings/slices"
 
 	spiderpoolv2beta1 "github.com/spidernet-io/spiderpool/pkg/k8s/apis/spiderpool.spidernet.io/v2beta1"
 )
@@ -86,7 +87,7 @@ func ValidateCoordinatorSpec(spec *spiderpoolv2beta1.CoordinatorSpec, requireOpt
 }
 
 func validateCoordinatorPodCIDRType(t string) *field.Error {
-	if t != cluster && t != calico && t != cilium {
+	if !slices.Contains(SupportedPodCIDRType, t) {
 		return field.NotSupported(
 			podCIDRTypeField,
 			t,