WINC-806: Add support for Windows Server 2022 in Azure #1093

mansikulkarni96 · 2022-06-06T21:07:45Z

This PR adds support for WS 2022 for Azure platform by updating the dev hack script, e2e test and the documentation.

openshift-ci · 2022-06-06T21:08:05Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

mansikulkarni96 · 2022-06-06T21:13:53Z

/test azure-e2e-operator

jrvaldes · 2022-06-07T14:18:56Z

docs/wmco-prerequisites.md

@@ -21,7 +21,7 @@ these errors, only use the appropriate version according to the cloud provider i
 | Cloud Provider | Supported Windows Server version                                                     |
 |----------------|--------------------------------------------------------------------------------------|
 | AWS            | Windows Server 2019, version 1809 Long-Term Servicing Channel (LTSC)                 |
-| Azure          | Windows Server 2019, version 1809 Long-Term Servicing Channel (LTSC)                 |
+| Azure          | - Windows Server 2019, version 1809 Long-Term Servicing Channel (LTSC)<br>- Windows Server 2022 Long-Term Servicing Channel (LTSC)                 |


Format the MD table. See this change.

jrvaldes · 2022-06-07T14:20:33Z

test/e2e/providers/azure/azure.go

@@ -18,7 +18,7 @@ const (
 	defaultCredentialsSecretName = "azure-cloud-credentials"
 	defaultImageOffer            = "WindowsServer"
 	defaultImagePublisher        = "MicrosoftWindowsServer"
-	defaultImageSKU              = "datacenter-core-20h2-with-containers-smalldisk"
+	defaultImageSKU              = "2022-datacenter-smalldisk"


See the container image for Azure:

windows-machine-config-operator/test/e2e/network_test.go

Line 455 in 3a63398

windowsServerImage = "mcr.microsoft.com/powershell:lts-nanoserver-20h2"

mansikulkarni96 · 2022-06-08T23:33:13Z

/test azure-e2e-operator

mansikulkarni96 · 2022-06-09T04:08:10Z

/test azure-e2e-operator

mansikulkarni96 · 2022-06-09T11:55:39Z

/test azure-e2e-operator

mansikulkarni96 · 2022-06-10T16:20:20Z

/test azure-e2e-operator

mansikulkarni96 · 2022-06-12T20:29:25Z

/test azure-e2e-operator

mansikulkarni96 · 2022-06-21T16:09:54Z

/test azure-e2e-operator

mansikulkarni96 · 2022-06-21T17:14:21Z

/test azure-e2e-operator
cluster bring up issues

mansikulkarni96 · 2022-06-22T18:00:58Z

/test azure-e2e-operator

mansikulkarni96 · 2022-06-24T15:58:30Z

/test azure-e2e-operator

mansikulkarni96 · 2022-06-27T03:33:20Z

/test azure-e2e-operator

saifshaikh48 · 2022-06-27T16:02:31Z

test/e2e/network_test.go

@@ -452,7 +452,7 @@ func (tc *testContext) getWindowsServerContainerImage() string {
 		windowsServerImage = "mcr.microsoft.com/powershell:lts-nanoserver-2004"
 	} else if tc.CloudProvider.GetType() == config.AzurePlatformType {
 		// On Azure we are testing 20H2


The comment needs updating away from 20H2

saifshaikh48 · 2022-06-27T16:14:38Z

test/e2e/validation_test.go

-	if tc.hasCustomVXLAN {
-		powershellDefaultCommand = strings.ReplaceAll(command, "\\\"", "\"")
-	}
+	powershellDefaultCommand = strings.ReplaceAll(command, "\\\"", "\"")


Won't this cause the AWS tests fails on this PR since they still use 2019? I think if tc.hasCustomVXLAN || tc.CloudProvider.GetType() == config.AzurePlatformType is the needed clause for this to merge

@saifshaikh48 is right, until #1091 merges AWS still needs this. I proposed an alternative platform-specific approach.

jrvaldes

Thanks @mansikulkarni96 for working on this, comments added. PTAL

jrvaldes · 2022-06-27T16:07:06Z

docs/machineset-azure.md

 ```shell script
  az vm image list --all --location <location> \
      --publisher MicrosoftWindowsServer \
      --offer WindowsServer \
-      --sku 2019-Datacenter-with-Containers \
-      --query "[?contains(version, '17763.1457.2009030514')]"
+      --sku 2022-Datacenter


s/2022-Datacenter/2022-datacenter

jrvaldes · 2022-06-27T16:10:03Z

docs/machineset-azure.md

@@ -9,17 +9,14 @@ oc get -o jsonpath='{.status.infrastructureName}{"\n"}' infrastructure cluster

 `<zone>` should be replaced with a valid Azure availability zone like `us-east-1a`.

-`<image>` should be a WindowsServer image offering that defines the 2019-Datacenter-with-Containers SKU with version
-          17763.1457.2009030514 or earlier. Run the following command to list Azure image info:
+`<image>` should be a WindowsServer image offering that defines the 2022-Datacenter SKU.


Shouldn't we recommend 2022-datacenter-smalldisk as we are using it the machineSet.sh script and e2e test suite.

I don't think that is required, I preferred to use smalldisk due to it's size but it can be changed to 2022-datacenter. We were using smalldisk for 2019 testing as well.

jrvaldes · 2022-06-27T16:21:16Z

test/e2e/network_test.go

@@ -452,7 +452,7 @@ func (tc *testContext) getWindowsServerContainerImage() string {
 		windowsServerImage = "mcr.microsoft.com/powershell:lts-nanoserver-2004"
 	} else if tc.CloudProvider.GetType() == config.AzurePlatformType {
 		// On Azure we are testing 20H2
-		windowsServerImage = "mcr.microsoft.com/powershell:lts-nanoserver-20h2"
+		windowsServerImage = "mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022"
 	} else {
 		// For other providers we use 1809
 		windowsServerImage = "mcr.microsoft.com/powershell:lts-nanoserver-1809"


I don't feel we will be using WS2019 as default any longer. PTAL at this commit, where I'm proposing WS2022 as the new normal.

yes one of our PR's would have to be rebased depending on what goes first, having that logic present in one should be sufficient right?

i dont see anything wrong with this change
rebase conflicts can be handled when they arise.

jrvaldes · 2022-06-27T16:25:28Z

pkg/secrets/secrets.go

@@ -56,7 +56,7 @@ func GenerateUserData(publicKey ssh.PublicKey) (*core.Secret, error) {
 			$firewallRuleName = "ContainerLogsPort"
 			$containerLogsPort = "10250"
 			New-NetFirewallRule -DisplayName $firewallRuleName -Direction Inbound -Action Allow -Protocol TCP -LocalPort $containerLogsPort -EdgeTraversalPolicy Allow
-			Set-Service -Name sshd -StartupType ‘Automatic’
+			Set-Service -Name sshd -StartupType 'Automatic'


Does it work without any quote? See this example.

It didn't work for me when I tried it locally.

If this is required for 2022 to work, it ideally should be in the same commit as the e2e tests introducing our use of 2022. that commit can then be reframed as azure 2022 support.

Alternatively this needs to be before the e2e commit, if someone checked out the repo w/ the e2e commit as HEAD the tests would fail.

This commit extends the use of PS commands adjusted for WS2022 to include vSphere and Azure platforms instead of the vxlan port.

This commit updates the azure provider file to bring up machineSets with Windows Server 2022 image in CI e2e tests. It also updates the image used for deployment in the network tests. This commit also increases the node creation time as the nodes are taking longer to be ready with the requirement of VM restart after installing the Containers feature on each VM.

This commit updates the docs to declare WMCO support for Azure on Windows Server 2022.

jrvaldes · 2022-06-29T12:06:28Z

/test aws-e2e-ccm-install

jrvaldes · 2022-06-29T12:06:33Z

/test aws-e2e-upgrade

jrvaldes · 2022-06-29T12:06:42Z

/lgtm

sebsoto · 2022-06-29T12:49:04Z

/approve

openshift-ci · 2022-06-29T12:54:39Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jrvaldes, mansikulkarni96, sebsoto

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [sebsoto]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2022-06-29T13:12:34Z

/retest-required

Remaining retests: 2 against base HEAD f3bc9da and 8 for PR HEAD dff38de in total

selansen · 2022-06-29T13:12:55Z

/lgtm

openshift-ci-robot · 2022-06-29T14:12:52Z

/retest-required

Remaining retests: 1 against base HEAD f3bc9da and 7 for PR HEAD dff38de in total

openshift-ci · 2022-06-29T16:54:29Z

@mansikulkarni96: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

mansikulkarni96 · 2022-06-29T18:13:30Z

/cherry-pick release-4.11

mansikulkarni96 · 2022-06-29T18:13:48Z

/cherry-pick community-4.10

openshift-cherrypick-robot · 2022-06-29T18:14:12Z

@mansikulkarni96: new pull request created: #1109

In response to this:

/cherry-pick release-4.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-cherrypick-robot · 2022-06-29T18:14:27Z

@mansikulkarni96: new pull request created: #1110

In response to this:

/cherry-pick community-4.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

sebsoto · 2022-08-23T17:38:47Z

/cherry-pick release-4.10

openshift-cherrypick-robot · 2022-08-23T17:39:28Z

@sebsoto: #1093 failed to apply on top of branch "release-4.10":

Applying: Fix quotes for PS command in userDataSecret
Applying: Set Datacenter-2022 SKU in machineset.sh
Applying: Update condition for using WS2022 PS commands
Applying: Set datacenter-2022 SKU in azure tests
Applying: Declare support for Azure 2022
Using index info to reconstruct a base tree...
M	docs/wmco-prerequisites.md
Falling back to patching base and 3-way merge...
Auto-merging docs/wmco-prerequisites.md
CONFLICT (content): Merge conflict in docs/wmco-prerequisites.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 Declare support for Azure 2022
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 6, 2022

openshift-ci bot requested review from sebsoto and selansen June 6, 2022 21:08

mansikulkarni96 force-pushed the WINC-806 branch from d8b601c to 5f5a969 Compare June 6, 2022 21:12

jrvaldes reviewed Jun 7, 2022

View reviewed changes

mansikulkarni96 force-pushed the WINC-806 branch from 5f5a969 to a687454 Compare June 8, 2022 14:03

mansikulkarni96 force-pushed the WINC-806 branch from 6cc51cf to a687454 Compare June 21, 2022 16:09

mansikulkarni96 force-pushed the WINC-806 branch 3 times, most recently from 9c1c111 to 6d305f5 Compare June 22, 2022 17:58

mansikulkarni96 marked this pull request as ready for review June 22, 2022 20:29

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 22, 2022

mansikulkarni96 marked this pull request as draft June 24, 2022 15:58

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 24, 2022

mansikulkarni96 force-pushed the WINC-806 branch from 543764a to f2b3ba2 Compare June 27, 2022 15:52

saifshaikh48 reviewed Jun 27, 2022

View reviewed changes

jrvaldes reviewed Jun 27, 2022

View reviewed changes

openshift-ci bot assigned jrvaldes Jun 28, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 28, 2022

mansikulkarni96 added 3 commits June 28, 2022 19:24

[e2e] Update condition for using WS2022 PS commands

3cf3f5e

This commit extends the use of PS commands adjusted for WS2022 to include vSphere and Azure platforms instead of the vxlan port.

[docs] Declare support for Azure 2022

dff38de

This commit updates the docs to declare WMCO support for Azure on Windows Server 2022.

mansikulkarni96 force-pushed the WINC-806 branch from 07f1a41 to dff38de Compare June 28, 2022 23:24

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 28, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 29, 2022

jrvaldes mentioned this pull request Jun 29, 2022

WINC-805: Add support for Windows Server 2022 in AWS #1091

Closed

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 29, 2022

openshift-ci bot assigned selansen Jun 29, 2022

openshift-ci bot merged commit cfc5bb9 into openshift:master Jun 29, 2022

openshift-cherrypick-robot mentioned this pull request Jun 29, 2022

[release-4.11] WINC-806: Add support for Windows Server 2022 in Azure #1109

Merged

openshift-cherrypick-robot mentioned this pull request Jun 29, 2022

[community-4.10] WINC-806: Add support for Windows Server 2022 in Azure #1110

Merged

sebsoto mentioned this pull request Aug 23, 2022

[release-4.10] WINC-806: Add support for Windows Server 2022 in Azure #1204

Closed

WINC-806: Add support for Windows Server 2022 in Azure #1093

WINC-806: Add support for Windows Server 2022 in Azure #1093

Conversation

mansikulkarni96 commented Jun 6, 2022

openshift-ci bot commented Jun 6, 2022

mansikulkarni96 commented Jun 6, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mansikulkarni96 commented Jun 8, 2022

mansikulkarni96 commented Jun 9, 2022

mansikulkarni96 commented Jun 9, 2022

mansikulkarni96 commented Jun 10, 2022

mansikulkarni96 commented Jun 12, 2022

mansikulkarni96 commented Jun 21, 2022

mansikulkarni96 commented Jun 21, 2022

mansikulkarni96 commented Jun 22, 2022

mansikulkarni96 commented Jun 24, 2022

mansikulkarni96 commented Jun 27, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrvaldes commented Jun 29, 2022

jrvaldes commented Jun 29, 2022

jrvaldes commented Jun 29, 2022

sebsoto commented Jun 29, 2022

openshift-ci bot commented Jun 29, 2022

openshift-ci-robot commented Jun 29, 2022

selansen commented Jun 29, 2022

openshift-ci-robot commented Jun 29, 2022

openshift-ci bot commented Jun 29, 2022

mansikulkarni96 commented Jun 29, 2022

mansikulkarni96 commented Jun 29, 2022

openshift-cherrypick-robot commented Jun 29, 2022

openshift-cherrypick-robot commented Jun 29, 2022

sebsoto commented Aug 23, 2022

openshift-cherrypick-robot commented Aug 23, 2022