Merge pull request #4690 from k8s-infra-cherrypick-robot/cherry-pick-…

…4689-to-release-1.13 [release-1.13] remove kubeletConfig.topologyManagerPolicy from AKS test templates
kubernetes-sigs · Mar 30, 2024 · fcb6264 · fcb6264
2 parents 966a9fc + d06d753
commit fcb6264
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 9 deletions.
diff --git a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml
diff --git a/templates/test/ci/cluster-template-prow-aks.yaml b/templates/test/ci/cluster-template-prow-aks.yaml
diff --git a/templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool1.yaml b/templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool1.yaml
@@ -24,7 +24,6 @@ spec:
         cpuCfsQuotaPeriod: "110ms"
         imageGcHighThreshold: 70
         imageGcLowThreshold: 50
-        topologyManagerPolicy: "best-effort"
         allowedUnsafeSysctls:
           - "net.*"
           - "kernel.msg*"

diff --git a/templates/test/ci/prow-aks/patches/aks-pool1.yaml b/templates/test/ci/prow-aks/patches/aks-pool1.yaml
@@ -22,7 +22,6 @@ spec:
     cpuCfsQuotaPeriod: "110ms"
     imageGcHighThreshold: 70
     imageGcLowThreshold: 50
-    topologyManagerPolicy: "best-effort"
     allowedUnsafeSysctls:
       - "net.*"
       - "kernel.msg*"

diff --git a/test/e2e/aks_versions.go b/test/e2e/aks_versions.go
@@ -22,7 +22,6 @@ package e2e
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4"
@@ -170,10 +169,6 @@ func getLatestStableAKSKubernetesVersionOffset(ctx context.Context, subscription
 			if patch[:1] != "v" && !ptr.Deref(minor.IsPreview, false) {
 				version = "v" + patch
 			}
-			// v1.29 is broken for our pool1 configuration.
-			if strings.HasPrefix(version, "v1.29.") {
-				continue
-			}
 			orchestratorversions = append(orchestratorversions, version)
 		}
 	}