feat: Adding Windows Server version 1903 support #1464
Conversation
/hold I'm manually running |
cc @kkmsft |
Codecov Report
@@ Coverage Diff @@
## master #1464 +/- ##
=======================================
Coverage 75.77% 75.77%
=======================================
Files 128 128
Lines 18357 18357
=======================================
Hits 13910 13910
Misses 3651 3651
Partials 796 796 |
@@ -645,7 +645,7 @@ https://{keyvaultname}.vault.azure.net:443/secrets/{secretName}/{version} | |||
| windowsSku | no | SKU usedto find Windows VM to deploy from marketplace. Default: `Datacenter-Core-1809-with-Containers-smalldisk` | | |||
| imageVersion | no | Specific image version to deploy from marketplace. Default: `latest` | | |||
| windowsImageSourceURL | no | Path to an existing Azure storage blob with a sysprepped VHD. This is used to test pre-release or customized VHD files that you have uploaded to Azure. If provided, the above 4 parameters are ignored. | | |||
| sshEnabled | no | If set to `true`, OpenSSH will be installed on windows nodes to allow for ssh remoting. **Only for Windows version 1809 or 2019** . The same SSH authorized public key(s) will be added from [linuxProfile.ssh.publicKeys](#linuxProfile) | | |||
| sshEnabled | no | If set to `true`, OpenSSH will be installed on windows nodes to allow for ssh remoting. **Only for Windows version 1809/2019 or later** . The same SSH authorized public key(s) will be added from [linuxProfile.ssh.publicKeys](#linuxProfile) | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just for understanding - is this because ssh by default is supported in 1809/2019 or later ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, it's available but not started by default. Setting this option will finish setting up SSHD and start the service
113d7f5
to
198fe9a
Compare
test/e2e/kubernetes/job/job.go
Outdated
@@ -57,6 +60,45 @@ func CreateJobFromFile(filename, name, namespace string) (*Job, error) { | |||
return job, nil | |||
} | |||
|
|||
// CreateWindowsJobFromTemplate will create a Job from file with a name | |||
func CreateWindowsJobFromTemplate(filename, name, namespace, servercore string) (*Job, error) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jackfrancis - looks like you were the last to update the validate-dns-windows.yaml
area. What do you think of this approach?
parts/k8s/windowskubeletfunc.ps1
Outdated
# Reference for these tags: curl -L https://mcr.microsoft.com/v2/k8s/core/pause/tags/list | ||
# Then docker run --rm mplatform/manifest-tool inspect mcr.microsoft.com/k8s/core/pause:<tag> | ||
|
||
$windowsBase = switch ($computerInfo.WindowsVersion) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm debating whether or not this version-specific behavior should be in scripts on the node, or part of AKS-Engine.
Pros for AKS-Engine:
- can override pause image with another one in ACR, Docker Hub, or elsewhere
Pros for this script:
- AKS-Engine could deploy multiple Windows agent pools and each node will automatically figure out the right image
I'm running a second test with the new apimodel attached in the PR. I ran it against an earlier commit and it passed but double checking now. |
AKS-Engine E2E passes with the new definition checked in. 🛳 it
|
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jackfrancis, PatrickLang 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:
Approvers can indicate their approval by writing |
/unhold |
/hold release |
Reason for Change:
This adds support for Windows Server version 1903, along with a sample and brief update to clusterdefinition.md. I also cleaned up the container version references and added comments to help identify what containers to use with the next Windows OS version change.
Issue Fixed:
resolves #1462
Requirements:
Notes: