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

feat: cherry pick changes from master to support kubernetes 1.18.1 #3076

Merged
merged 11 commits into from Apr 22, 2020

Conversation

bowen5
Copy link

@bowen5 bowen5 commented Apr 16, 2020

Reason for Change:

Cherry pick changes from aks-engine master branch to bring the kubernetes 1.18.1 support into this branch.

Issue Fixed:

Requirements:

Notes:

bowen5 and others added 4 commits April 16, 2020 17:35
…odes (Azure#2457)

* Adding WindowsNodeReset.ps1 script to reset/cleanup state for windox^C nodes

* fix linting errors

* fixing  comments per CR feedback

(cherry picked from commit 8be7000)
* feat: add support for Kubernetes 1.18.0-beta.1

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.18.md/#v1180-beta1

* fix: windows support .zip URL

(cherry picked from commit 34706cf)
@bowen5
Copy link
Author

bowen5 commented Apr 16, 2020

/assign @xuto2

@@ -41,7 +41,9 @@ Write-AzureConfig {
[Parameter(Mandatory = $true)][string]
$KubeDir,
[Parameter(Mandatory = $true)][string]
$TargetEnvironment
$TargetEnvironment,
Copy link
Contributor

Choose a reason for hiding this comment

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

@AbelHu FYI

@xuto2
Copy link
Contributor

xuto2 commented Apr 22, 2020

/lgtm

@xuto2 xuto2 merged commit 3c6e785 into Azure:aks-release-v0.47.0-1 Apr 22, 2020
xuto2 added a commit that referenced this pull request Apr 23, 2020
@bowen5 bowen5 deleted the aks-release-v0.47.0-1 branch April 26, 2020 09:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants