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

Fix Windows sku + offer + publisher k8s and swarm variables #2955

Merged
merged 2 commits into from
May 15, 2018

Conversation

CecileRobertMichon
Copy link
Contributor

What this PR does / why we need it: PR #2664 allowed specifying a custom sku + offer + publisher for DCOS, this PR is extending that to k8s and swarm as well.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #2953

Special notes for your reviewer:

If applicable:

  • documentation
  • unit tests
  • tested backward compatibility (ie. deploy with previous version, upgrade with this branch)

Release note:

@ghost ghost added the in progress label May 15, 2018
@CecileRobertMichon CecileRobertMichon changed the title Fix agentWindowsSku k8s variable Fix agentWindowsSku k8s and swarm variable May 15, 2018
"agentWindowsSku": "2016-Datacenter-with-Containers",
"agentWindowsPublisher": "[parameters('agentWindowsPublisher')]",
"agentWindowsOffer": "[parameters('agentWindowsOffer')]",
"agentWindowsSku": "[parameters('agentWindowsSku')]",
Copy link
Contributor Author

@CecileRobertMichon CecileRobertMichon May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is changing the SKU default from 2016-Datacenter-with-Containers to Datacenter-Core-1709-with-Containers-smalldisk and the offer default from WindowsServer to WindowsServerSemiAnnual, consistent with #2664 FYI cc: @JiangtianLi

@CecileRobertMichon CecileRobertMichon changed the title Fix agentWindowsSku k8s and swarm variable Fix Windows sku + offer + publisher k8s and swarm variables May 15, 2018
JiangtianLi
JiangtianLi previously approved these changes May 15, 2018
Copy link
Contributor

@JiangtianLi JiangtianLi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@codecov
Copy link

codecov bot commented May 15, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@5bcd3c8). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #2955   +/-   ##
=========================================
  Coverage          ?   50.78%           
=========================================
  Files             ?       97           
  Lines             ?    14703           
  Branches          ?        0           
=========================================
  Hits              ?     7467           
  Misses            ?     6539           
  Partials          ?      697

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5bcd3c8...5cfe59b. Read the comment docs.

Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@jackfrancis jackfrancis merged commit b334578 into Azure:master May 15, 2018
@ghost ghost removed the in progress label May 15, 2018
@CecileRobertMichon CecileRobertMichon deleted the agent-win-sku branch June 6, 2018 19:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Setting Windows Sku doesn't update the variable for azuredeploy.json
3 participants