test: Disable failing kubnet tests

docs/topics/features.md

@@ -514,7 +514,7 @@ We are investigating possible risks & mitigations for when VMs are deprovisioned
 
 Kubernetes 1.18 introduces alpha support for the ContainerD runtime on Windows Server 2019. This is still a work-in-progress tracked in [kubernetes/enhancements#1001](https://github.com/kubernetes/enhancements/issues/1001). This feature in AKS-Engine is for testing the in-development versions of ContainerD and Kubernetes, and is not for production use. Be sure to review [open issues](https://github.com/azure/aks-engine/issues?q=containerd+label%3Awindows+is%3Aopen) if you want to test or contribute to this effort.
 
-Currently it only supports the `kubenet` networking model, and requires URLs to custom ContainerD and CNI plugin builds.
+Currently it requires URLs to custom ContainerD and CNI plugin builds.
 
 ### Deploying multi-OS clusters with ContainerD
 

pkg/api/vlabs/const.go

@@ -95,7 +95,7 @@ const (
 
 var (
 	// NetworkPluginValues holds the valid values for network plugin implementation
-	NetworkPluginValues = [...]string{"", "kubenet", "azure", NetworkPluginCilium, NetworkPluginAntrea, "flannel"}
+	NetworkPluginValues = [...]string{"", NetworkPluginKubenet, "azure", NetworkPluginCilium, NetworkPluginAntrea, "flannel"}
 
 	// NetworkPolicyValues holds the valid values for a network policy
 	// "azure" and "none" are there for backwards-compatibility
@@ -142,6 +142,8 @@ const (
 	NetworkModeBridge = "bridge"
 	// NetworkModeTransparent is the string expression for transparent network mode config option
 	NetworkModeTransparent = "transparent"
+	// NetworkPluginKubenet is the string expression for kubenet network plugin config option
+	NetworkPluginKubenet = "kubenet"
 )
 
 const (

pkg/api/vlabs/validate.go

@@ -1667,6 +1667,10 @@ func (k *KubernetesConfig) validateNetworkPlugin(hasWindows bool) error {
 		return errors.Errorf("networkPlugin '%s' is not supporting windows agents", networkPlugin)
 	}
 
+	if networkPlugin == NetworkPluginKubenet && hasWindows {
+		log.Warnf("Windows + Kubenet is for development and testing only, not recommended for production")
+	}
+
 	return nil
 }
 

pkg/api/vlabs/validate_test.go

@@ -906,6 +906,24 @@ func Test_Properties_ValidateNetworkPolicy(t *testing.T) {
 	}
 }
 
+func ExampleKubernetesConfig_validateNetworkPlugin() {
+	log.SetOutput(os.Stdout)
+	log.SetFormatter(&log.TextFormatter{
+		DisableColors:    true,
+		DisableTimestamp: true,
+	})
+	cs := getK8sDefaultContainerService(true)
+
+	cs.Properties.OrchestratorProfile.KubernetesConfig = &KubernetesConfig{}
+	cs.Properties.OrchestratorProfile.KubernetesConfig.NetworkPlugin = NetworkPluginKubenet
+	if err := cs.Properties.OrchestratorProfile.KubernetesConfig.validateNetworkPlugin(true); err != nil {
+		fmt.Printf("error in ValidateNetworkPlugin: %s", err)
+	}
+
+	// Output:
+	// level=warning msg="Windows + Kubenet is for development and testing only, not recommended for production"
+}
+
 func Test_Properties_ValidateNetworkPlugin(t *testing.T) {
 	p := &Properties{}
 	p.OrchestratorProfile = &OrchestratorProfile{}

test/e2e/engine/template.go

@@ -412,6 +412,11 @@ func (e *Engine) HasNetworkPolicy(name string) bool {
 	return strings.Contains(e.ExpandedDefinition.Properties.OrchestratorProfile.KubernetesConfig.NetworkPolicy, name)
 }
 
+// HasNetworkPolicy will return true if the specified network policy is enabled
+func (e *Engine) HasNetworkPlugin(name string) bool {
+	return strings.Contains(e.ExpandedDefinition.Properties.OrchestratorProfile.KubernetesConfig.NetworkPlugin, name)
+}
+
 // Write will write the cluster definition to disk
 func (e *Engine) Write() error {
 	json, err := helpers.JSONMarshal(e.ClusterDefinition, false)

test/e2e/kubernetes/kubernetes_test.go

@@ -1932,6 +1932,10 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 
 		It("should be able to resolve DNS across windows and linux deployments", func() {
 			if eng.HasWindowsAgents() {
+				if eng.HasNetworkPlugin(api.NetworkPluginKubenet) {
+					Skip("This tests is not enabled for kubenet CNI on windows")
+				}
+
 				windowsImages, err := eng.GetWindowsTestImages()
 				Expect(err).NotTo(HaveOccurred())
 				r := rand.New(rand.NewSource(time.Now().UnixNano()))
@@ -2102,6 +2106,10 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 					}
 				}
 
+				if eng.HasNetworkPlugin(api.NetworkPluginKubenet) {
+					Skip("This tests is not enabled for kubenet CNI on windows")
+				}
+
 				windowsImages, err := eng.GetWindowsTestImages()
 				Expect(err).NotTo(HaveOccurred())
 				r := rand.New(rand.NewSource(time.Now().UnixNano()))