chore: update VHD version to 04.30.2019 (#1184)

* chore: update VHD version to 04.20.2019 * remove ubuntu distro E2E gates for CIS * Revert "remove ubuntu distro E2E gates for CIS" This reverts commit 7d583ae. * remove ubuntu distro E2E gates for CIS with rebase * re-add gate for cloud-init files * test: only validate password enforcement for ubuntu
Azure · May 2, 2019 · 7ebc685 · 7ebc685
1 parent 4e1923b
commit 7ebc685
Show file tree

Hide file tree

Showing 4 changed files with 286 additions and 20 deletions.
diff --git a/pkg/api/azenvtypes.go b/pkg/api/azenvtypes.go
@@ -137,15 +137,15 @@ var (
 		ImageOffer:     "aks",
 		ImageSku:       "aks-ubuntu-1604-201904",
 		ImagePublisher: "microsoft-aks",
-		ImageVersion:   "2019.04.24",
+		ImageVersion:   "2019.04.30",
 	}
 
 	// DefaultAKS1804OSImageConfig is the AKS image based on Ubuntu 18.04-LTS.
 	DefaultAKS1804OSImageConfig = AzureOSImageConfig{
 		ImageOffer:     "aks",
 		ImageSku:       "aks-ubuntu-1804-201904",
 		ImagePublisher: "microsoft-aks",
-		ImageVersion:   "2019.04.24",
+		ImageVersion:   "2019.04.30",
 	}
 
 	// DefaultACC1604OSImageConfig is the ACC image based on Ubuntu 16.04.

diff --git a/releases/vhd-notes/aks-ubuntu-1604/aks-ubuntu-1604-201904_2019.04.30.txt b/releases/vhd-notes/aks-ubuntu-1604/aks-ubuntu-1604-201904_2019.04.30.txt
@@ -0,0 +1,134 @@
+     Starting build on  Tue Apr 30 17:58:24 UTC 2019
+     Using kernel:
+     Linux version 4.15.0-1042-azure (buildd@lcy01-amd64-011) (gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.10)) #46-Ubuntu SMP Thu Apr 4 16:30:23 UTC 2019
+     Components downloaded in this VHD build (some of the below components might get deleted during cluster provisioning if they are not needed):
+       - apt-transport-https
+       - blobfuse
+       - ca-certificates
+       - ceph-common
+       - cgroup-lite
+       - cifs-utils
+       - conntrack
+       - cracklib-runtime
+       - ebtables
+       - ethtool
+       - fuse
+       - git
+       - glusterfs-client
+       - init-system-helpers
+       - iproute2
+       - ipset
+       - iptables
+       - jq
+       - libpam-pwquality
+       - libpwquality-tools
+       - mount
+       - nfs-common
+       - pigz socat
+       - util-linux
+       - xz-utils
+       - zip
+       - etcd v3.2.25
+       - moby v3.0.4
+       - nvidia-docker2 nvidia-container-runtime
+       - Azure CNI version 1.0.18
+       - Azure CNI version 1.0.17
+       - CNI plugin version 0.7.5
+       - CNI plugin version 0.7.1
+       - containerd version 1.2.4
+       - containerd version 1.1.6
+       - containerd version 1.1.5
+       - img
+     Docker images pre-pulled:
+       - k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.1
+       - k8s.gcr.io/exechealthz-amd64:1.2
+       - k8s.gcr.io/addon-resizer:1.8.4
+       - k8s.gcr.io/addon-resizer:1.8.1
+       - k8s.gcr.io/addon-resizer:1.7
+       - k8s.gcr.io/heapster-amd64:v1.5.4
+       - k8s.gcr.io/heapster-amd64:v1.5.3
+       - k8s.gcr.io/heapster-amd64:v1.5.1
+       - k8s.gcr.io/metrics-server-amd64:v0.2.1
+       - k8s.gcr.io/k8s-dns-kube-dns-amd64:1.15.0
+       - k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.13
+       - k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5
+       - k8s.gcr.io/kube-addon-manager-amd64:v9.0
+       - k8s.gcr.io/kube-addon-manager-amd64:v8.9
+       - k8s.gcr.io/kube-addon-manager-amd64:v8.8
+       - k8s.gcr.io/kube-addon-manager-amd64:v8.7
+       - k8s.gcr.io/kube-addon-manager-amd64:v8.6
+       - k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.15.0
+       - k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.10
+       - k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.8
+       - k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5
+       - k8s.gcr.io/pause-amd64:3.1
+       - msazurestackdocker/pause-amd64:3.1
+       - gcr.io/kubernetes-helm/tiller:v2.11.0
+       - gcr.io/kubernetes-helm/tiller:v2.8.1
+       - k8s.gcr.io/cluster-autoscaler:v1.14.0
+       - k8s.gcr.io/cluster-autoscaler:v1.13.2
+       - k8s.gcr.io/cluster-autoscaler:v1.13.1
+       - k8s.gcr.io/cluster-autoscaler:v1.12.3
+       - k8s.gcr.io/cluster-autoscaler:v1.12.2
+       - k8s.gcr.io/cluster-autoscaler:v1.3.7
+       - k8s.gcr.io/cluster-autoscaler:v1.3.4
+       - k8s.gcr.io/cluster-autoscaler:v1.3.3
+       - k8s.gcr.io/cluster-autoscaler:v1.2.2
+       - k8s.gcr.io/cluster-autoscaler:v1.1.2
+       - k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10
+       - k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.8
+       - k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.7
+       - k8s.gcr.io/coredns:1.3.1
+       - k8s.gcr.io/coredns:1.2.6
+       - k8s.gcr.io/coredns:1.2.2
+       - k8s.gcr.io/rescheduler:v0.4.0
+       - k8s.gcr.io/rescheduler:v0.3.1
+       - microsoft/virtual-kubelet:latest
+       - containernetworking/networkmonitor:v0.0.6
+       - containernetworking/networkmonitor:v0.0.5
+       - containernetworking/azure-npm:v1.0.18
+       - nvidia/k8s-device-plugin:1.11
+       - nvidia/k8s-device-plugin:1.10
+       - docker.io/deis/hcp-tunnel-front:v1.9.2-v4.0.4
+       - docker.io/deis/kube-svc-redirect:v1.0.2
+       - mcr.microsoft.com/k8s/flexvolume/keyvault-flexvolume:v0.0.7
+       - mcr.microsoft.com/k8s/flexvolume/blobfuse-flexvolume:1.0.8
+       - gcr.io/google-containers/ip-masq-agent-amd64:v2.0.0
+       - k8s.gcr.io/ip-masq-agent-amd64:v2.0.0
+       - nginx:1.13.12-alpine
+       - mcr.microsoft.com/k8s/kms/keyvault:v0.0.9
+       - quay.io/coreos/flannel:v0.10.0
+       - quay.io/coreos/flannel:v0.8.0
+       - busybox
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.14.1
+       - k8s.gcr.io/hyperkube-amd64:v1.14.1
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.14.0
+       - k8s.gcr.io/hyperkube-amd64:v1.14.0
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.13.5
+       - k8s.gcr.io/hyperkube-amd64:v1.13.5
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.13.4
+       - k8s.gcr.io/hyperkube-amd64:v1.13.4
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.12.8
+       - k8s.gcr.io/hyperkube-amd64:v1.12.8
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.12.7
+       - k8s.gcr.io/hyperkube-amd64:v1.12.7
+       - msazurestackdocker/hyperkube-amd64:v1.12.7-azs
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.11.9
+       - k8s.gcr.io/hyperkube-amd64:v1.11.9
+       - msazurestackdocker/hyperkube-amd64:v1.11.9-azs
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.11.8
+       - k8s.gcr.io/hyperkube-amd64:v1.11.8
+       - msazurestackdocker/hyperkube-amd64:v1.11.8-azs
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.10.13
+       - k8s.gcr.io/hyperkube-amd64:v1.10.13
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.10.12
+       - k8s.gcr.io/hyperkube-amd64:v1.10.12
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.9.11
+       - k8s.gcr.io/hyperkube-amd64:v1.9.11
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.9.10
+       - k8s.gcr.io/hyperkube-amd64:v1.9.10
+     Install completed successfully on  Tue Apr 30 18:17:57 UTC 2019
+     VSTS Build NUMBER: 20190430.9
+     VSTS Build ID: 21824452
+     Commit: 516821e825b0c17fb8638023b51caa343e6c474d
+     Feature flags:
diff --git a/releases/vhd-notes/aks-ubuntu-1804/aks-ubuntu-1804-201904_2019.04.30.txt b/releases/vhd-notes/aks-ubuntu-1804/aks-ubuntu-1804-201904_2019.04.30.txt
@@ -0,0 +1,134 @@
+     Starting build on  Tue Apr 30 17:55:59 UTC 2019
+     Using kernel:
+     Linux version 4.18.0-1014-azure (buildd@lcy01-amd64-010) (gcc version 7.3.0 (Ubuntu 7.3.0-16ubuntu3)) #14~18.04.1-Ubuntu SMP Mon Mar 18 16:15:53 UTC 2019
+     Components downloaded in this VHD build (some of the below components might get deleted during cluster provisioning if they are not needed):
+       - apt-transport-https
+       - blobfuse
+       - ca-certificates
+       - ceph-common
+       - cgroup-lite
+       - cifs-utils
+       - conntrack
+       - cracklib-runtime
+       - ebtables
+       - ethtool
+       - fuse
+       - git
+       - glusterfs-client
+       - init-system-helpers
+       - iproute2
+       - ipset
+       - iptables
+       - jq
+       - libpam-pwquality
+       - libpwquality-tools
+       - mount
+       - nfs-common
+       - pigz socat
+       - util-linux
+       - xz-utils
+       - zip
+       - etcd v3.2.25
+       - moby v3.0.4
+       - nvidia-docker2 nvidia-container-runtime
+       - Azure CNI version 1.0.18
+       - Azure CNI version 1.0.17
+       - CNI plugin version 0.7.5
+       - CNI plugin version 0.7.1
+       - containerd version 1.2.4
+       - containerd version 1.1.6
+       - containerd version 1.1.5
+       - img
+     Docker images pre-pulled:
+       - k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.1
+       - k8s.gcr.io/exechealthz-amd64:1.2
+       - k8s.gcr.io/addon-resizer:1.8.4
+       - k8s.gcr.io/addon-resizer:1.8.1
+       - k8s.gcr.io/addon-resizer:1.7
+       - k8s.gcr.io/heapster-amd64:v1.5.4
+       - k8s.gcr.io/heapster-amd64:v1.5.3
+       - k8s.gcr.io/heapster-amd64:v1.5.1
+       - k8s.gcr.io/metrics-server-amd64:v0.2.1
+       - k8s.gcr.io/k8s-dns-kube-dns-amd64:1.15.0
+       - k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.13
+       - k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5
+       - k8s.gcr.io/kube-addon-manager-amd64:v9.0
+       - k8s.gcr.io/kube-addon-manager-amd64:v8.9
+       - k8s.gcr.io/kube-addon-manager-amd64:v8.8
+       - k8s.gcr.io/kube-addon-manager-amd64:v8.7
+       - k8s.gcr.io/kube-addon-manager-amd64:v8.6
+       - k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.15.0
+       - k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.10
+       - k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.8
+       - k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5
+       - k8s.gcr.io/pause-amd64:3.1
+       - msazurestackdocker/pause-amd64:3.1
+       - gcr.io/kubernetes-helm/tiller:v2.11.0
+       - gcr.io/kubernetes-helm/tiller:v2.8.1
+       - k8s.gcr.io/cluster-autoscaler:v1.14.0
+       - k8s.gcr.io/cluster-autoscaler:v1.13.2
+       - k8s.gcr.io/cluster-autoscaler:v1.13.1
+       - k8s.gcr.io/cluster-autoscaler:v1.12.3
+       - k8s.gcr.io/cluster-autoscaler:v1.12.2
+       - k8s.gcr.io/cluster-autoscaler:v1.3.7
+       - k8s.gcr.io/cluster-autoscaler:v1.3.4
+       - k8s.gcr.io/cluster-autoscaler:v1.3.3
+       - k8s.gcr.io/cluster-autoscaler:v1.2.2
+       - k8s.gcr.io/cluster-autoscaler:v1.1.2
+       - k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10
+       - k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.8
+       - k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.7
+       - k8s.gcr.io/coredns:1.3.1
+       - k8s.gcr.io/coredns:1.2.6
+       - k8s.gcr.io/coredns:1.2.2
+       - k8s.gcr.io/rescheduler:v0.4.0
+       - k8s.gcr.io/rescheduler:v0.3.1
+       - microsoft/virtual-kubelet:latest
+       - containernetworking/networkmonitor:v0.0.6
+       - containernetworking/networkmonitor:v0.0.5
+       - containernetworking/azure-npm:v1.0.18
+       - nvidia/k8s-device-plugin:1.11
+       - nvidia/k8s-device-plugin:1.10
+       - docker.io/deis/hcp-tunnel-front:v1.9.2-v4.0.4
+       - docker.io/deis/kube-svc-redirect:v1.0.2
+       - mcr.microsoft.com/k8s/flexvolume/keyvault-flexvolume:v0.0.7
+       - mcr.microsoft.com/k8s/flexvolume/blobfuse-flexvolume:1.0.8
+       - gcr.io/google-containers/ip-masq-agent-amd64:v2.0.0
+       - k8s.gcr.io/ip-masq-agent-amd64:v2.0.0
+       - nginx:1.13.12-alpine
+       - mcr.microsoft.com/k8s/kms/keyvault:v0.0.9
+       - quay.io/coreos/flannel:v0.10.0
+       - quay.io/coreos/flannel:v0.8.0
+       - busybox
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.14.1
+       - k8s.gcr.io/hyperkube-amd64:v1.14.1
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.14.0
+       - k8s.gcr.io/hyperkube-amd64:v1.14.0
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.13.5
+       - k8s.gcr.io/hyperkube-amd64:v1.13.5
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.13.4
+       - k8s.gcr.io/hyperkube-amd64:v1.13.4
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.12.8
+       - k8s.gcr.io/hyperkube-amd64:v1.12.8
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.12.7
+       - k8s.gcr.io/hyperkube-amd64:v1.12.7
+       - msazurestackdocker/hyperkube-amd64:v1.12.7-azs
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.11.9
+       - k8s.gcr.io/hyperkube-amd64:v1.11.9
+       - msazurestackdocker/hyperkube-amd64:v1.11.9-azs
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.11.8
+       - k8s.gcr.io/hyperkube-amd64:v1.11.8
+       - msazurestackdocker/hyperkube-amd64:v1.11.8-azs
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.10.13
+       - k8s.gcr.io/hyperkube-amd64:v1.10.13
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.10.12
+       - k8s.gcr.io/hyperkube-amd64:v1.10.12
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.9.11
+       - k8s.gcr.io/hyperkube-amd64:v1.9.11
+       - k8s.gcr.io/cloud-controller-manager-amd64:v1.9.10
+       - k8s.gcr.io/hyperkube-amd64:v1.9.10
+     Install completed successfully on  Tue Apr 30 18:29:09 UTC 2019
+     VSTS Build NUMBER: 20190430.7
+     VSTS Build ID: 21824392
+     Commit: 516821e825b0c17fb8638023b51caa343e6c474d
+     Feature flags:
diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go
@@ -345,22 +345,22 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 		})
 
 		It("should validate password enforcement configuration", func() {
-			if eng.ExpandedDefinition.Properties.IsUbuntuDistroForAllNodes() {
-				kubeConfig, err := GetConfig()
-				Expect(err).NotTo(HaveOccurred())
-				master := fmt.Sprintf("%s@%s", eng.ExpandedDefinition.Properties.LinuxProfile.AdminUsername, kubeConfig.GetServerName())
-				nodeList, err := node.GetReady()
-				Expect(err).NotTo(HaveOccurred())
-				pwQualityValidateScript := "pwquality-validate.sh"
-				cmd := exec.Command("scp", "-i", masterSSHPrivateKeyFilepath, "-P", masterSSHPort, "-o", "StrictHostKeyChecking=no", filepath.Join(ScriptsDir, pwQualityValidateScript), master+":/tmp/"+pwQualityValidateScript)
-				util.PrintCommand(cmd)
-				out, err := cmd.CombinedOutput()
-				log.Printf("%s\n", out)
-				Expect(err).NotTo(HaveOccurred())
-				var conn *remote.Connection
-				conn, err = remote.NewConnection(kubeConfig.GetServerName(), masterSSHPort, eng.ExpandedDefinition.Properties.LinuxProfile.AdminUsername, masterSSHPrivateKeyFilepath)
-				Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodeList.Nodes {
+			kubeConfig, err := GetConfig()
+			Expect(err).NotTo(HaveOccurred())
+			master := fmt.Sprintf("%s@%s", eng.ExpandedDefinition.Properties.LinuxProfile.AdminUsername, kubeConfig.GetServerName())
+			nodeList, err := node.GetReady()
+			Expect(err).NotTo(HaveOccurred())
+			pwQualityValidateScript := "pwquality-validate.sh"
+			cmd := exec.Command("scp", "-i", masterSSHPrivateKeyFilepath, "-P", masterSSHPort, "-o", "StrictHostKeyChecking=no", filepath.Join(ScriptsDir, pwQualityValidateScript), master+":/tmp/"+pwQualityValidateScript)
+			util.PrintCommand(cmd)
+			out, err := cmd.CombinedOutput()
+			log.Printf("%s\n", out)
+			Expect(err).NotTo(HaveOccurred())
+			var conn *remote.Connection
+			conn, err = remote.NewConnection(kubeConfig.GetServerName(), masterSSHPort, eng.ExpandedDefinition.Properties.LinuxProfile.AdminUsername, masterSSHPrivateKeyFilepath)
+			Expect(err).NotTo(HaveOccurred())
+			for _, node := range nodeList.Nodes {
+				if node.IsUbuntu() {
 					err := conn.CopyToRemote(node.Metadata.Name, "/tmp/"+pwQualityValidateScript)
 					Expect(err).NotTo(HaveOccurred())
 					pwQualityValidationCommand := fmt.Sprintf("\"/tmp/%s\"", pwQualityValidateScript)
@@ -369,8 +369,6 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 					_, err = cmd.CombinedOutput()
 					Expect(err).NotTo(HaveOccurred())
 				}
-			} else {
-				Skip("pwquality only works on ubuntu distro until this lands in a VHD")
 			}
 		})