WINC-805: Use Windows Server 2019 in aws-e2e-operator test#29791
Merged
openshift-ci[bot] merged 1 commit intoJul 5, 2022
Merged
Conversation
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
Contributor
|
Skipping CI for Draft Pull Request. |
jrvaldes
force-pushed
the
add-windows-ami-filter-env-var
branch
from
11642a4 to
8de62f0
Compare
Contributor
|
/lgtm |
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Jun 27, 2022
This commit leverage the environment variables introduced in openshift/release#29791 to allow a parameter-based configuration for the machine and container images used in the e2e test suit.
jrvaldes
changed the title
openshift-ci
Bot
removed
the
do-not-merge/work-in-progress
Contributor
|
/remove-lgtm |
jrvaldes
force-pushed
the
add-windows-ami-filter-env-var
branch
from
8de62f0 to
ae817eb
Compare
sebsoto
reviewed
Jun 28, 2022
Comment on lines
91
to
92
Contributor
There was a problem hiding this comment.
IMO this is embedding too much logic within the release repo. We shouldn't need to open a release PR if we want to change the container image being used. I'd suggest sticking with a single env var which if set indicates 2019 should be used.
Contributor
Author
There was a problem hiding this comment.
Everything is about context and in this context, we need a specific variation of the configuration for one of the tests. The required logic could be explicit (as proposed) or implicit (defined by a flag as you recommend). A single env var should have enough context to explain its usage which in this case may complicate its definition.
For example, the name of the single env var could be WINDOWS_SERVER_2019_ENABLED which is tightened to a specific version of Windows Server (2019). The latter, cannot be extended to other versions, where we may end up with multiple env vars to support multiple versions, followed by several conditional statements in the WMCO's e2e code.
To change the "default" container image being used, no release PR is needed. To adjust the corner case, yes. Both cases, a PR is required.
The introduction of the VM_TEMPLATE env var for vSphere, was the first stepping stone towards moving the Windows Server image definition to the release repo for the e2e test. I feel the proposed env vars align with that approach.
Contributor
There was a problem hiding this comment.
I would be more okay with this if it was just describing infrastructure, like the vSphere tests you point to do. But its not just infrastructure, you're moving part of the test workload definition to the release job as well with WINDOWS_CONTAINER_IMAGE. What happens if we need to include more changes to the tests which are different for 2019/2022, such as using runtimeclasses?
I want to avoid more logic being moved to the release repo. So I see two possible options here, either use a simple WINDOWS_SERVER_2019_ENABLED, or use the Windows node status to figure out the Windows server version. The first option is a lot simpler.
Contributor
There was a problem hiding this comment.
To be honest, I lean towards the solution that requires no release repo changes. It seems doable to keep everything configured through the WMCO repo's e2e test suite.
One suggestion is to replace tc.hasCustomVXLAN with a flag isWindowsServer2022 in the testContext struct, setting it at the time of machineset creation in the e2e test suite. Might require some parsing of the machine set spec to see the OS version of the image being used.
Contributor
Author
There was a problem hiding this comment.
Makes sense, let me adjust that.
jrvaldes
force-pushed
the
add-windows-ami-filter-env-var
branch
from
ae817eb to
be0539a
Compare
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Jun 30, 2022
This commit leverage the environment variables introduced in openshift/release#29791 to allow a parameter-based configuration for the machine and container images used in the e2e test suit.
saifshaikh48
pushed a commit
to saifshaikh48/windows-machine-config-operator
that referenced
this pull request
Jun 30, 2022
This commit leverage the environment variables introduced in openshift/release#29791 to allow a parameter-based configuration for the machine and container images used in the e2e test suit. (cherry picked from commit 419d49b)
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Jul 5, 2022
This commit leverage the environment variables introduced in openshift/release#29791 to allow a parameter-based configuration for the machine and container images used in the e2e test suit.
jrvaldes
force-pushed
the
add-windows-ami-filter-env-var
branch
from
be0539a to
d28f001
Compare
This commit adds an environment variable to the aws-e2e-operator test to cover Windows Server 2019 in one of the CI jobs, as it is a supported version.
jrvaldes
force-pushed
the
add-windows-ami-filter-env-var
branch
from
d28f001 to
f27f329
Compare
openshift-ci
Bot
removed
the
do-not-merge/work-in-progress
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Jul 5, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Jul 5, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
Contributor
|
/approve |
openshift-ci
Bot
added
the
approved
Contributor
|
/lgtm |
Member
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jrvaldes, mansikulkarni96, saifshaikh48, sebsoto The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
|
@jrvaldes: Updated the following 4 configmaps:
DetailsIn response to this:
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. |
Contributor
|
@jrvaldes: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Jul 5, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Jul 6, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Jul 9, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Jul 19, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Jul 25, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Aug 4, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Aug 11, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Aug 11, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Aug 12, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Aug 13, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without Docker container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Aug 17, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Aug 17, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suit. In addition, updates the logic to select the container image based on the cloud provider, where the default container image must be compatible with Windows Server 2022. Finally, adjusts the PowerShell cmdlets for WS2022 to avoid the escaping the double-quotes when default shell is Powershell.
jrvaldes
added a commit
to jrvaldes/windows-machine-config-operator
that referenced
this pull request
Nov 10, 2022
This commit updates the AWS's EC2 AMI to use Windows Server 2022 base image without container runtime. The container runtime (containerd) is installed by WMCO. It also leverages the environment variable introduced in openshift/release#29791 to allow a parameter-based configuration for Windows Server version, where the machine and container images can be adjusted in the e2e test suite. In addition, adjusts the logic for PowerShell cmdlets to avoid escaping the double-quotes when default shell is PowerShell to taking into account the Windows Server version.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds an environment variable to the aws-e2e-operator test to
cover Windows Server 2019 in one of the CI jobs, as it is a supported version.