Skip to content

[WIP] Use windows-2022 images by default and in e2e #5924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −16
Draft

[WIP] Use windows-2022 images by default and in e2e #5924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azure/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const (
// DefaultLinuxGalleryImageName is the default Linux community gallery image definition.
DefaultLinuxGalleryImageName = "capi-ubun2-2404"
// DefaultWindowsGalleryImageName is the default Windows community gallery image definition.
DefaultWindowsGalleryImageName = "capi-win-2019-containerd"
DefaultWindowsGalleryImageName = "capi-win-2022-containerd"
)

const (
Expand All @@ -72,7 +72,7 @@ const (
const (
// DefaultWindowsOsAndVersion is the default Windows Server version to use when
// generating default images for Windows nodes.
DefaultWindowsOsAndVersion = "windows-2019"
DefaultWindowsOsAndVersion = "windows-2022"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion azure/services/virtualmachineimages/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (s *Service) GetDefaultWindowsImage(ctx context.Context, _, k8sVersion, run
if len(match) != 2 {
return nil, errors.Errorf("unsupported osAndVersion %s", osAndVersion)
}
imageName = strings.Replace(imageName, "2019", match[1], 1)
imageName = strings.Replace(imageName, "2022", match[1], 1)
}

// Use the Azure Marketplace for specific older versions, to keep "clusterctl upgrade" from rolling new machines.
Expand Down
2 changes: 1 addition & 1 deletion templates/test/ci/cluster-template-prow-ci-version-windows.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion templates/test/ci/cluster-template-prow-machine-pool-ci-version-windows.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
marketplace:
publisher: cncf-upstream
offer: capi-windows
sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
sku: ${WINDOWS_SERVER_VERSION:=windows-2022}-containerd-gen1
version: "latest"
identity: UserAssigned
userAssignedIdentities:
Expand Down
2 changes: 1 addition & 1 deletion templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
marketplace:
publisher: cncf-upstream
offer: capi-windows
sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
sku: ${WINDOWS_SERVER_VERSION:=windows-2022}-containerd-gen1
version: "latest"
identity: UserAssigned
userAssignedIdentities:
Expand Down
2 changes: 1 addition & 1 deletion ...test/ci/prow-machine-pool-ci-version-windows/patches/machine-pool-ci-version-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
marketplace:
publisher: cncf-upstream
offer: capi-windows
sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
sku: ${WINDOWS_SERVER_VERSION:=windows-2022}-containerd-gen1
version: latest
identity: UserAssigned
userAssignedIdentities:
Expand Down
2 changes: 1 addition & 1 deletion templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
marketplace:
publisher: cncf-upstream
offer: capi-windows
sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
sku: ${WINDOWS_SERVER_VERSION:=windows-2022}-containerd-gen1
version: latest
identity: UserAssigned
userAssignedIdentities:
Expand Down
2 changes: 1 addition & 1 deletion templates/test/dev/cluster-template-custom-builds-machine-pool-windows.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion templates/test/dev/cluster-template-custom-builds-windows.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ustom-builds-machine-pool-windows/patches/machine-pool-deployment-pr-version-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ spec:
marketplace:
publisher: cncf-upstream
offer: capi-windows
sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
sku: ${WINDOWS_SERVER_VERSION:=windows-2022}-containerd-gen1
version: latest
2 changes: 1 addition & 1 deletion ...st/dev/custom-builds-machine-pool/patches/machine-pool-deployment-pr-version-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ spec:
marketplace:
publisher: cncf-upstream
offer: capi-windows
sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
sku: ${WINDOWS_SERVER_VERSION:=windows-2022}-containerd-gen1
version: latest
2 changes: 1 addition & 1 deletion templates/test/dev/custom-builds-windows/patches/machine-deployment-pr-version-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ spec:
marketplace:
publisher: cncf-upstream
offer: capi-windows
sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
sku: ${WINDOWS_SERVER_VERSION:=windows-2022}-containerd-gen1
version: latest
2 changes: 1 addition & 1 deletion templates/test/dev/custom-builds/patches/machine-deployment-pr-version-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ spec:
marketplace:
publisher: cncf-upstream
offer: capi-windows
sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1
sku: ${WINDOWS_SERVER_VERSION:=windows-2022}-containerd-gen1
version: latest
2 changes: 1 addition & 1 deletion test/e2e/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ func resolveKubernetesVersions(config *clusterctl.E2EConfig) {
windowsRequired := testWindows == "true"

if windowsRequired {
windowsVersions := getVersionsInCommunityGallery(ctx, os.Getenv(AzureLocation), capiCommunityGallery, "capi-win-2019-containerd")
windowsVersions := getVersionsInCommunityGallery(ctx, os.Getenv(AzureLocation), capiCommunityGallery, "capi-win-2022-containerd")
for k, v := range linuxVersions {
if _, ok := windowsVersions[k]; ok {
versions = append(versions, v)
Expand Down
Loading