Merge pull request #4686 from nojnhuh/aks-pin

k8s-ci-robot · web-flow · commit 8fcb9a25f88f · 2024-03-28T17:29:02.000-07:00
ignore k8s v1.29 in AKS e2e test
diff --git a/test/e2e/aks_versions.go b/test/e2e/aks_versions.go
@@ -22,6 +22,7 @@ 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"
@@ -169,6 +170,10 @@ 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)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ package e2e`
`22`	`22`	`import (`
`23`	`23`	`"context"`
`24`	`24`	`"fmt"`
	`25`	`+ "strings"`
`25`	`26`
`26`	`27`	`"github.com/Azure/azure-sdk-for-go/sdk/azidentity"`
`27`	`28`	`"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4"`
`@@ -169,6 +170,10 @@ func getLatestStableAKSKubernetesVersionOffset(ctx context.Context, subscription`
`169`	`170`	`if patch[:1] != "v" && !ptr.Deref(minor.IsPreview, false) {`
`170`	`171`	`version = "v" + patch`
`171`	`172`	`}`
	`173`	`+ // v1.29 is broken for our pool1 configuration.`
	`174`	`+ if strings.HasPrefix(version, "v1.29.") {`
	`175`	`+ continue`
	`176`	`+ }`
`172`	`177`	`orchestratorversions = append(orchestratorversions, version)`
`173`	`178`	`}`
`174`	`179`	`}`