Fix service IP validation to handle "ClusterIP: None"

danwinship · danwinship · commit 92fcb8e46bef · 2017-04-17T09:44:11.000-04:00
diff --git a/pkg/sdn/plugin/master.go b/pkg/sdn/plugin/master.go
@@ -155,7 +155,8 @@ func (master *OsdnMaster) validateNetworkConfig() error {
 		return err
 	}
 	for _, svc := range services.Items {
-		if !ni.ServiceNetwork.Contains(net.ParseIP(svc.Spec.ClusterIP)) {
+		svcIP := net.ParseIP(svc.Spec.ClusterIP)
+		if svcIP != nil && !ni.ServiceNetwork.Contains(svcIP) {
 			errList = append(errList, fmt.Errorf("Error: Existing service with IP: %s is not part of service network: %s", svc.Spec.ClusterIP, ni.ServiceNetwork.String()))
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,8 @@ func (master *OsdnMaster) validateNetworkConfig() error {`
`155`	`155`	`return err`
`156`	`156`	`}`
`157`	`157`	`for _, svc := range services.Items {`
`158`		`- if !ni.ServiceNetwork.Contains(net.ParseIP(svc.Spec.ClusterIP)) {`
	`158`	`+ svcIP := net.ParseIP(svc.Spec.ClusterIP)`
	`159`	`+ if svcIP != nil && !ni.ServiceNetwork.Contains(svcIP) {`
`159`	`160`	`errList = append(errList, fmt.Errorf("Error: Existing service with IP: %s is not part of service network: %s", svc.Spec.ClusterIP, ni.ServiceNetwork.String()))`
`160`	`161`	`}`
`161`	`162`	`}`