Skip to content

Commit 632516c

Browse files
authored
Merge pull request #3273 from CecileRobertMichon/windows-vmss-fix
Fix windows vmss e2e test
2 parents 0f497f8 + f29a906 commit 632516c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

test/e2e/config/azure-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ providers:
149149
variables:
150150
AKS_KUBERNETES_VERSION: "latest"
151151
AKS_KUBERNETES_VERSION_UPGRADE_FROM: "latest-1"
152-
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.25}"
152+
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.25.6}" # temporary pin to v1.25.6 to workaround windows VM provisioning errors with v1.25.7.
153153
FLATCAR_KUBERNETES_VERSION: "${FLATCAR_KUBERNETES_VERSION:-stable-1.25}"
154154
FLATCAR_VERSION: "${FLATCAR_VERSION:-latest}"
155155
ETCD_VERSION_UPGRADE_TO: "3.5.4-0"

test/e2e/kubernetes/windows/windows.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ func (i *WindowsImage) GetImage(version OSVersion) string {
5252

5353
func GetWindowsImage(testImage WindowsTestImages, version OSVersion) string {
5454
httpd := WindowsImage{
55-
BaseImage: "k8sprow.azurecr.io/kubernetes-e2e-test-images/httpd",
55+
BaseImage: "registry.k8s.io/e2e-test-images/httpd",
5656
Tags: map[OSVersion]string{
57-
LTSC2019: "2.4.39-alpine",
57+
LTSC2019: "2.4.39-4",
5858
},
5959
}
6060

0 commit comments

Comments
 (0)