Skip to content

Commit 25d1874

Browse files
authored
Merge pull request #4691 from k8s-infra-cherrypick-robot/cherry-pick-4689-to-release-1.14
[release-1.14] remove kubeletConfig.topologyManagerPolicy from AKS test templates
2 parents 0772f59 + 96a6ecd commit 25d1874

File tree

5 files changed

+0
-9
lines changed

5 files changed

+0
-9
lines changed

templates/test/ci/cluster-template-prow-aks-clusterclass.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-aks.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool1.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ spec:
2424
cpuCfsQuotaPeriod: "110ms"
2525
imageGcHighThreshold: 70
2626
imageGcLowThreshold: 50
27-
topologyManagerPolicy: "best-effort"
2827
allowedUnsafeSysctls:
2928
- "net.*"
3029
- "kernel.msg*"

templates/test/ci/prow-aks/patches/aks-pool1.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ spec:
2222
cpuCfsQuotaPeriod: "110ms"
2323
imageGcHighThreshold: 70
2424
imageGcLowThreshold: 50
25-
topologyManagerPolicy: "best-effort"
2625
allowedUnsafeSysctls:
2726
- "net.*"
2827
- "kernel.msg*"

test/e2e/aks_versions.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ package e2e
2222
import (
2323
"context"
2424
"fmt"
25-
"strings"
2625

2726
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
2827
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4"
@@ -170,10 +169,6 @@ func getLatestStableAKSKubernetesVersionOffset(ctx context.Context, subscription
170169
if patch[:1] != "v" && !ptr.Deref(minor.IsPreview, false) {
171170
version = "v" + patch
172171
}
173-
// v1.29 is broken for our pool1 configuration.
174-
if strings.HasPrefix(version, "v1.29.") {
175-
continue
176-
}
177172
orchestratorversions = append(orchestratorversions, version)
178173
}
179174
}

0 commit comments

Comments
 (0)