Merge branch 'master' into add-k8s-1.17.5

Azure · Apr 17, 2020 · 7381778 · 7381778
2 parents a3c6595 + da5319e
commit 7381778
Show file tree

Hide file tree

Showing 7 changed files with 270 additions and 269 deletions.
diff --git a/docs/topics/clusterdefinitions.md b/docs/topics/clusterdefinitions.md
@@ -832,6 +832,7 @@ https://{keyvaultname}.vault.azure.net:443/secrets/{secretName}/{version}
 | adminUsername                 | yes      | Username for the Windows adminstrator account created on each Windows node                                                                                                                                                                      |
 | adminPassword                 | yes      | Password for the Windows adminstrator account created on each Windows node                                                                                                                                                                      |
 | csiProxyURL                   | no       | Path to a package containing csi proxy binaries for Windows.                                                                                                                                                                                    |
+| enableAutomaticUpdates        | no       | If set to `true` Windows Update will be configured to automatically apply updates on Windows nodes. Default: `false`                                                                                                                            |
 | enableCSIProxy                | no       | If set to `true` the csi-proxy specified by `windowsProfile.csiProxyURL` will get installed during node provisioning. See [Windows Csi Proxy](csi-proxy-windows.md) for more details.                                                           |
 | windowsPublisher              | no       | Publisher used to find Windows VM to deploy from marketplace. Default: `microsoft-aks`                                                                                                                                                          |
 | windowsOffer                  | no       | Offer used to find Windows VM to deploy from marketplace. Default: `aks-windows`                                                                                                                                                                |

diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go
@@ -164,8 +164,9 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	"1.16.4":         false,
 	"1.16.5":         false, // disabled because of https://github.com/kubernetes/release/issues/1020
 	"1.16.6":         false,
-	"1.16.7":         true,
+	"1.16.7":         false,
 	"1.16.8":         true,
+	"1.16.9":         true,
 	"1.17.0-alpha.1": false,
 	"1.17.0-alpha.2": false,
 	"1.17.0-alpha.3": false,

diff --git a/pkg/api/const.go b/pkg/api/const.go
@@ -223,7 +223,7 @@ const (
 	// https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits#load-balancer.
 	DefaultMaximumLoadBalancerRuleCount = 250
 	// DefaultEnableAutomaticUpdates determines the aks-engine provided default for enabling automatic updates
-	DefaultEnableAutomaticUpdates = true
+	DefaultEnableAutomaticUpdates = false
 	// DefaultPreserveNodesProperties determines the aks-engine provided default for preserving nodes properties
 	DefaultPreserveNodesProperties = true
 	// DefaultEnableVMSSNodePublicIP determines the aks-engine provided default for enable VMSS node public IP

diff --git a/pkg/api/k8s_versions.go b/pkg/api/k8s_versions.go
@@ -53,7 +53,7 @@ const (
 	virtualKubeletImageReference                      string = "virtual-kubelet:latest"
 	azureCNINetworkMonitorImageReference              string = "networkmonitor:v0.0.8"
 	tillerImageReference                              string = "oss/kubernetes/tiller:v2.13.1"
-	csiSecretsStoreProviderAzureImageReference        string = "k8s/csi/secrets-store/provider-azure:0.0.3"
+	csiSecretsStoreProviderAzureImageReference        string = "k8s/csi/secrets-store/provider-azure:0.0.4"
 	csiSecretsStoreDriverImageReference               string = "k8s/csi/secrets-store/driver:v0.0.9"
 )
 

diff --git a/pkg/api/types_test.go b/pkg/api/types_test.go
@@ -3453,8 +3453,8 @@ func TestWindowsProfile(t *testing.T) {
 	}
 
 	update := w.GetEnableWindowsUpdate()
-	if !update {
-		t.Fatalf("Expected GetEnableWindowsUpdate() to equal default 'true', got %t", update)
+	if update {
+		t.Fatalf("Expected GetEnableWindowsUpdate() to equal default 'false', got %t", update)
 	}
 
 	autoGenerated := w.GetIsCredentialAutoGenerated()