Merge pull request #5272 from nojnhuh/azure-cni-conflict

fix conflict on azure-cni daemonset in AKS e2e

Author: k8s-ci-robot

test/e2e/aks.go

@@ -49,20 +49,11 @@ type DiscoverAndWaitForAKSControlPlaneInput struct {
 // This will be invoked by cluster api e2e framework.
 func WaitForAKSControlPlaneInitialized(ctx context.Context, input clusterctl.ApplyCustomClusterTemplateAndWaitInput, result *clusterctl.ApplyCustomClusterTemplateAndWaitResult) {
 	client := input.ClusterProxy.GetClient()
-	cluster := framework.GetClusterByName(ctx, framework.GetClusterByNameInput{
-		Getter:    client,
-		Name:      input.ClusterName,
-		Namespace: input.Namespace,
-	})
-
 	DiscoverAndWaitForAKSControlPlaneInitialized(ctx, DiscoverAndWaitForAKSControlPlaneInput{
 		Lister:  client,
 		Getter:  client,
 		Cluster: result.Cluster,
 	}, input.WaitForControlPlaneIntervals...)
-	if cluster.Spec.ClusterNetwork != nil && cluster.Spec.ClusterNetwork.Services != nil {
-		InstallCNIManifest(ctx, input, cluster.Spec.ClusterNetwork.Services.CIDRBlocks, true)
-	}
 }
 
 // WaitForAKSControlPlaneReady waits for the azure managed control plane to be ready.

test/e2e/azure_test.go

@@ -725,7 +725,6 @@ var _ = Describe("Workload cluster creation", func() {
 			clusterTemplate := createApplyClusterTemplateInput(
 				specName,
 				withFlavor("aks"),
-				withAzureCNIv1Manifest(e2eConfig.GetVariable(AzureCNIv1Manifest)),
 				withNamespace(namespace.Name),
 				withClusterName(clusterName),
 				withKubernetesVersion(kubernetesVersionUpgradeFrom),
@@ -932,7 +931,6 @@ var _ = Describe("Workload cluster creation", func() {
 			clusterctl.ApplyClusterTemplateAndWait(ctx, createApplyClusterTemplateInput(
 				specName,
 				withFlavor("aks-topology"),
-				withAzureCNIv1Manifest(e2eConfig.GetVariable(AzureCNIv1Manifest)),
 				withNamespace(namespace.Name),
 				withClusterName(clusterName),
 				withKubernetesVersion(kubernetesVersionUpgradeFrom),