Merge branch 'master' into add-k8s-1.17.8

Azure · Jun 30, 2020 · 93f54f2 · 93f54f2
2 parents e4d7b6b + ea54daf
commit 93f54f2
Show file tree

Hide file tree

Showing 16 changed files with 825 additions and 362 deletions.
diff --git a/parts/k8s/addons/aci-connector.yaml b/parts/k8s/addons/aci-connector.yaml
@@ -89,7 +89,7 @@ spec:
       containers:
       - name: aci-connector
         image: {{ContainerImage "aci-connector"}}
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         env:
         - name: KUBELET_PORT
           value: "10250"

diff --git a/parts/k8s/addons/azure-policy-deployment.yaml b/parts/k8s/addons/azure-policy-deployment.yaml
@@ -352,7 +352,7 @@ spec:
           limits:
             cpu: {{ContainerCPULimits "gatekeeper"}}
             memory: {{ContainerMemLimits "gatekeeper"}}
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
             path: /healthz
@@ -663,7 +663,7 @@ spec:
           limits:
             cpu: {{ContainerCPULimits "azure-policy"}}
             memory: {{ContainerMemLimits "azure-policy"}}
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         env:
         - name: K8S_POLICY_PREFIX
           value: azurepolicy

diff --git a/parts/k8s/addons/cilium.yaml b/parts/k8s/addons/cilium.yaml
@@ -209,7 +209,7 @@ spec:
               name: cilium-config
               optional: true
         image: {{ContainerImage "cilium-agent"}}
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
             exec:
@@ -444,7 +444,7 @@ spec:
               name: cilium-aws
               optional: true
         image: {{ContainerImage "cilium-operator"}}
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         name: cilium-operator
         volumeMounts:
         - mountPath: /var/lib/etcd-config

diff --git a/parts/k8s/addons/container-monitoring.yaml b/parts/k8s/addons/container-monitoring.yaml
@@ -332,7 +332,7 @@ spec:
       containers:
         - name: omsagent
           image: {{ContainerImage "omsagent"}}
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           resources:
             limits:
               cpu: {{ContainerCPULimits "omsagent"}}

diff --git a/parts/k8s/addons/kubernetes-dashboard.yaml b/parts/k8s/addons/kubernetes-dashboard.yaml
@@ -167,7 +167,7 @@ spec:
       containers:
         - name: kubernetes-dashboard
           image: {{ContainerImage "kubernetes-dashboard"}}
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8443
               protocol: TCP

diff --git a/parts/k8s/addons/secrets-store-csi-driver.yaml b/parts/k8s/addons/secrets-store-csi-driver.yaml
@@ -147,7 +147,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
@@ -175,7 +175,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
           ports:
@@ -207,7 +207,7 @@ spec:
               memory: {{ContainerMemReqs "secrets-store"}}
         - name: liveness-probe
           image: {{ContainerImage "livenessprobe"}}
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           args:
           - --csi-address=/csi/csi.sock
           - --probe-timeout=3s
@@ -265,7 +265,7 @@ spec:
       containers:
         - name: provider-azure-installer
           image: {{ContainerImage "provider-azure-installer"}}
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           env:
             - name: TARGET_DIR
               value: "/etc/kubernetes/secrets-store-csi-providers"

diff --git a/parts/k8s/addons/smb-flexvolume.yaml b/parts/k8s/addons/smb-flexvolume.yaml
@@ -32,7 +32,7 @@ spec:
                 - flatcar
       - name: smb-flexvol-installer
         image: {{ContainerImage "smb-flexvolume"}}
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         resources:
           requests:
             cpu: {{ContainerCPUReqs "smb-flexvolume"}}

diff --git a/pkg/api/azenvtypes.go b/pkg/api/azenvtypes.go
@@ -166,31 +166,31 @@ var (
 		ImageOffer:     "aks",
 		ImageSku:       "aks-engine-ubuntu-1604-202006",
 		ImagePublisher: "microsoft-aks",
-		ImageVersion:   "2020.06.22",
+		ImageVersion:   "2020.06.25",
 	}
 
 	// AKSUbuntu1804OSImageConfig is the AKS image based on Ubuntu 18.04-LTS.
 	AKSUbuntu1804OSImageConfig = AzureOSImageConfig{
 		ImageOffer:     "aks",
 		ImageSku:       "aks-engine-ubuntu-1804-202006",
 		ImagePublisher: "microsoft-aks",
-		ImageVersion:   "2020.06.22",
+		ImageVersion:   "2020.06.25",
 	}
 
 	// AKSWindowsServer2019OSImageConfig is the AKS image based on Windows Server 2019
 	AKSWindowsServer2019OSImageConfig = AzureOSImageConfig{
 		ImageOffer:     "aks-windows",
 		ImageSku:       "2019-datacenter-core-smalldisk-2006",
 		ImagePublisher: "microsoft-aks",
-		ImageVersion:   "17763.1282.200610",
+		ImageVersion:   "17763.1282.200625",
 	}
 
 	// WindowsServer2019OSImageConfig is the 'vanilla' Windows Server 2019 image
 	WindowsServer2019OSImageConfig = AzureOSImageConfig{
 		ImageOffer:     "WindowsServer",
 		ImageSku:       "2019-Datacenter-Core-with-Containers-smalldisk",
 		ImagePublisher: "MicrosoftWindowsServer",
-		ImageVersion:   "17763.1217.2005081535",
+		ImageVersion:   "17763.1282.2006061953",
 	}
 
 	// ACC1604OSImageConfig is the ACC image based on Ubuntu 16.04.

diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go
@@ -194,8 +194,9 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	"1.18.0":         false,
 	"1.18.1":         false,
 	"1.18.2":         false,
-	"1.18.3":         true,
+	"1.18.3":         false,
 	"1.18.4":         true,
+	"1.18.5":         true,
 	"1.19.0-alpha.1": true,
 	"1.19.0-alpha.2": true,
 	"1.19.0-alpha.3": true,

diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go
@@ -178,7 +178,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
 			properties: &Properties{
 				OrchestratorProfile: &OrchestratorProfile{
 					OrchestratorType:    "Kubernetes",
-					OrchestratorVersion: "1.18.3",
+					OrchestratorVersion: "1.18.5",
 					KubernetesConfig: &KubernetesConfig{
 						LoadBalancerSku:             BasicLoadBalancerSku,
 						ExcludeMasterFromStandardLB: to.BoolPtr(true),
@@ -192,7 +192,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
 			properties: &Properties{
 				OrchestratorProfile: &OrchestratorProfile{
 					OrchestratorType:    "Kubernetes",
-					OrchestratorVersion: "1.18.3",
+					OrchestratorVersion: "1.18.5",
 					KubernetesConfig: &KubernetesConfig{
 						LoadBalancerOutboundIPs: to.IntPtr(17),
 					},

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go