Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

feat: Adding Windows Server version 1903 support #1464

Merged
merged 4 commits into from Jun 20, 2019

Conversation

PatrickLang
Copy link
Contributor

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:

@acs-bot acs-bot added the size/L label Jun 12, 2019
@PatrickLang
Copy link
Contributor Author

/hold

I'm manually running make test-kubernetes on that sample included to make sure E2E tests pass with Windows Server version 1903 + Kubernetes 1.15.0-beta.2

@PatrickLang
Copy link
Contributor Author

cc @kkmsft

@codecov
Copy link

codecov bot commented Jun 12, 2019

Codecov Report

Merging #1464 into master will not change coverage.
The diff coverage is n/a.

@@           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) |
Copy link
Contributor

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 ?

Copy link
Contributor Author

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

@PatrickLang PatrickLang force-pushed the windows1903 branch 2 times, most recently from 113d7f5 to 198fe9a Compare June 13, 2019 02:09
@@ -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) {
Copy link
Contributor Author

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?

# 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) {
Copy link
Contributor Author

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

@PatrickLang PatrickLang changed the title feature: Adding Windows Server version 1903 support feat: Adding Windows Server version 1903 support Jun 19, 2019
@PatrickLang
Copy link
Contributor Author

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.

@jackfrancis jackfrancis added this to In progress in backlog Jun 19, 2019
@PatrickLang
Copy link
Contributor Author

AKS-Engine E2E passes with the new definition checked in. 🛳 it

Ran 29 of 45 Specs in 1565.664 seconds
SUCCESS! -- 29 Passed | 0 Failed | 0 Pending | 16 Skipped
PASS  

@jackfrancis
Copy link
Member

/lgtm

@acs-bot
Copy link

acs-bot commented Jun 20, 2019

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jackfrancis
Copy link
Member

/unhold

@jackfrancis
Copy link
Member

/hold release

@jackfrancis jackfrancis merged commit 7f9555a into Azure:master Jun 20, 2019
backlog automation moved this from In progress to Done Jun 20, 2019
@PatrickLang PatrickLang deleted the windows1903 branch June 20, 2019 17:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
No open projects
backlog
  
Done
Development

Successfully merging this pull request may close these issues.

Add latest Windows Server SAC (1903) support
5 participants