Merge pull request #5371 from cathy-zhou/persistentIPFailure

cluster-manager clbs if udn requests PersistentIPs but it is not enabled

Author: trozet

go-controller/pkg/clustermanager/userdefinednetwork/template/net-attach-def-template.go

@@ -166,6 +166,9 @@ func renderCNINetworkConfig(networkName, nadName string, spec SpecGetter) (map[s
 			netConfSpec.VLANID = int(cfg.VLAN.Access.ID)
 		}
 	}
+	if netConfSpec.AllowPersistentIPs && !config.OVNKubernetesFeature.EnablePersistentIPs {
+		return nil, fmt.Errorf("allowPersistentIPs is set but persistentIPs is Disabled")
+	}
 
 	if err := util.ValidateNetConf(nadName, netConfSpec); err != nil {
 		return nil, err

go-controller/pkg/clustermanager/userdefinednetwork/template/net-attach-def-template_test.go

@@ -301,6 +301,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
 			// must be defined so the primary user defined network can match the ip families of the underlying cluster
 			config.IPv4Mode = true
 			config.IPv6Mode = true
+			config.OVNKubernetesFeature.EnablePersistentIPs = true
 			nad, err := RenderNetAttachDefManifest(testUdn, testNs)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(nad.TypeMeta).To(Equal(expectedNAD.TypeMeta))
@@ -436,6 +437,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
 			// must be defined so the primary user defined network can match the ip families of the underlying cluster
 			config.IPv4Mode = true
 			config.IPv6Mode = true
+			config.OVNKubernetesFeature.EnablePersistentIPs = true
 			nad, err := RenderNetAttachDefManifest(cudn, testNs)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(nad.TypeMeta).To(Equal(expectedNAD.TypeMeta))