Update to Kubernetes v1.14

* https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md#v1140 * https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md#v1141 * https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md#v1142 Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
zalando-incubator · Jul 8, 2019 · e4ce4c1 · e4ce4c1
1 parent ef5261a
commit e4ce4c1
Show file tree

Hide file tree

Showing 18 changed files with 241 additions and 202 deletions.
diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -75,7 +75,6 @@ image_policy: "trusted"
 {{else}}
 image_policy: "dev"
 {{end}}
-compliance_checker_enabled: "true"
 
 # cadvisor settings
 cadvisor_cpu: "150m"
@@ -192,7 +191,7 @@ teapot_admission_controller_validate_application_label: "false"
 {{end}}
 
 {{if eq .Environment "e2e"}}
-teapot_admission_controller_ignore_namespaces: "^kube-system|(e2e-tests-(downward-api|kubectl|projected|statefulset|pod-network)-.*)$"
+teapot_admission_controller_ignore_namespaces: "^kube-system|((downward-api|kubectl|projected|statefulset|pod-network)-.*)$"
 {{else}}
 teapot_admission_controller_ignore_namespaces: "^kube-system$"
 {{end}}

diff --git a/cluster/manifests/kube-proxy/daemonset.yaml b/cluster/manifests/kube-proxy/daemonset.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: kube-system
   labels:
     application: kube-proxy
-    version: v1.13.7
+    version: v1.14.3-1
 spec:
   selector:
     matchLabels:
@@ -17,7 +17,7 @@ spec:
       name: kube-proxy
       labels:
         application: kube-proxy
-        version: v1.13.7
+        version: v1.14.3-1
       annotations:
         config/hash: {{"configmap.yaml" | manifestHash}}
     spec:
@@ -31,7 +31,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: registry.opensource.zalan.do/teapot/kube-proxy:v1.13.7
+        image: registry.opensource.zalan.do/teapot/kube-proxy:v1.14.3-1
         args:
         - --hostname-override=$(HOSTNAME_OVERRIDE)
         - --config=/config/kube-proxy.yaml

diff --git a/cluster/node-pools/master-default/userdata.clc.yaml b/cluster/node-pools/master-default/userdata.clc.yaml
@@ -180,7 +180,7 @@ systemd:
       After=docker.service dockercfg.service meta-data-iptables.service private-ipv4.service
 
       [Service]
-      Environment=KUBELET_IMAGE_TAG=v1.13.7
+      Environment=KUBELET_IMAGE_TAG=v1.14.3-1
       Environment=KUBELET_IMAGE_ARGS=--exec=/kubelet
       Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/kubelet
       Environment="RKT_RUN_ARGS=--insecure-options=image \
@@ -356,7 +356,7 @@ storage:
           namespace: kube-system
           labels:
             application: kube-apiserver
-            version: v1.13.7
+            version: v1.14.3-1
           annotations:
             kubernetes-log-watcher/scalyr-parser: |
               [{"container": "webhook", "parser": "json-structured-log"}]
@@ -368,7 +368,7 @@ storage:
           hostNetwork: true
           containers:
           - name: kube-apiserver
-            image: registry.opensource.zalan.do/teapot/kube-apiserver:v1.13.7
+            image: registry.opensource.zalan.do/teapot/kube-apiserver:v1.14.3-1
             args:
             - --apiserver-count={{ .Values.apiserver_count }}
             - --bind-address=0.0.0.0
@@ -611,7 +611,7 @@ storage:
                 cpu: 100m
                 memory: 20Mi
 {{ end }}
-          - image: registry.opensource.zalan.do/teapot/image-policy-webhook:{{if eq .Cluster.ConfigItems.compliance_checker_enabled "true"}}master-44{{else}}v0.4.1{{end}}
+          - image: registry.opensource.zalan.do/teapot/image-policy-webhook:v0.5.2
             name: image-policy-webhook
             args:
             - --policy={{ .Cluster.ConfigItems.image_policy }}
@@ -712,15 +712,15 @@ storage:
           namespace: kube-system
           labels:
             application: kube-controller-manager
-            version: v1.13.7
+            version: v1.14.3-1
         spec:
           priorityClassName: system-node-critical
           tolerations:
           - key: node-role.kubernetes.io/master
             effect: NoSchedule
           containers:
           - name: kube-controller-manager
-            image: registry.opensource.zalan.do/teapot/kube-controller-manager:v1.13.7
+            image: registry.opensource.zalan.do/teapot/kube-controller-manager:v1.14.3-1
             args:
             - --kubeconfig=/etc/kubernetes/controller-kubeconfig
             - --leader-elect=true
@@ -787,7 +787,7 @@ storage:
           namespace: kube-system
           labels:
             application: kube-scheduler
-            version: v1.13.7
+            version: v1.14.3-1
         spec:
           priorityClassName: system-node-critical
           tolerations:
@@ -796,7 +796,7 @@ storage:
           hostNetwork: true
           containers:
           - name: kube-scheduler
-            image: registry.opensource.zalan.do/teapot/kube-scheduler:v1.13.7
+            image: registry.opensource.zalan.do/teapot/kube-scheduler:v1.14.3-1
             args:
             - --master=http://127.0.0.1:8080
             - --leader-elect=true
@@ -1255,7 +1255,7 @@ storage:
           --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
           --mount volume=dns,target=/etc/resolv.conf \
           --net=host \
-          docker://registry.opensource.zalan.do/teapot/kubectl:v1.13.7 \
+          docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.3-1 \
           --exec=/kubectl -- \
           --kubeconfig=/etc/kubernetes/kubeconfig \
           label node "$(hostname)" \
@@ -1268,7 +1268,7 @@ storage:
           --net=host \
           --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
           --mount volume=dns,target=/etc/resolv.conf \
-          docker://registry.opensource.zalan.do/teapot/kubectl:v1.13.7 \
+          docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.3-1 \
           --exec=/kubectl -- \
           --kubeconfig=/etc/kubernetes/kubeconfig \
           drain "$(hostname)" \

diff --git a/cluster/node-pools/master-ubuntu-default/userdata.yaml b/cluster/node-pools/master-ubuntu-default/userdata.yaml
@@ -348,7 +348,7 @@ write_files:
               cpu: 100m
               memory: 20Mi
 {{ end }}
-        - image: registry.opensource.zalan.do/teapot/image-policy-webhook:{{if eq .Cluster.ConfigItems.compliance_checker_enabled "true"}}master-44{{else}}v0.4.1{{end}}
+        - image: registry.opensource.zalan.do/teapot/image-policy-webhook:v0.5.2
           name: image-policy-webhook
           args:
           - --policy={{ .Cluster.ConfigItems.image_policy }}

diff --git a/cluster/node-pools/worker-default/userdata.clc.yaml b/cluster/node-pools/worker-default/userdata.clc.yaml
@@ -179,7 +179,7 @@ systemd:
       After=docker.service dockercfg.service meta-data-iptables.service private-ipv4.service collect-instance-metadata.service
 
       [Service]
-      Environment=KUBELET_IMAGE_TAG=v1.13.7
+      Environment=KUBELET_IMAGE_TAG=v1.14.3-1
       Environment=KUBELET_IMAGE_ARGS=--exec=/kubelet
       Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/kubelet
       Environment="RKT_RUN_ARGS=--insecure-options=image \
@@ -483,7 +483,7 @@ storage:
           --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
           --mount volume=dns,target=/etc/resolv.conf \
           --net=host \
-          docker://registry.opensource.zalan.do/teapot/kubectl:v1.13.7 \
+          docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.3-1 \
           --exec=/kubectl -- \
           --kubeconfig=/etc/kubernetes/kubeconfig \
           label node "$(hostname)" \
@@ -496,7 +496,7 @@ storage:
           --net=host \
           --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
           --mount volume=dns,target=/etc/resolv.conf \
-          docker://registry.opensource.zalan.do/teapot/kubectl:v1.13.7 \
+          docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.3-1 \
           --exec=/kubectl -- \
           --kubeconfig=/etc/kubernetes/kubeconfig \
           drain "$(hostname)" \

diff --git a/test/e2e/Makefile b/test/e2e/Makefile
@@ -2,7 +2,7 @@
 
 BINARY       ?= kubernetes-on-aws-e2e
 VERSION      ?= $(shell git describe --tags --always --dirty)
-KUBE_VERSION ?= v1.13.5
+KUBE_VERSION ?= v1.14.3
 IMAGE        ?= registry-write.opensource.zalan.do/teapot/$(BINARY)
 TAG          ?= $(VERSION)
 DOCKERFILE   ?= Dockerfile

diff --git a/test/e2e/README.md b/test/e2e/README.md
@@ -85,11 +85,11 @@ scratch and test the Kubernetes type Foo.
   		defer func() {
   			By("deleting the foo)
   			defer GinkgoRecover()
-  			err2 := cs.Core().Foo(ns).Delete(foo.Name, metav1.NewDeleteOptions(0))
+  			err2 := cs.CoreV1().Foo(ns).Delete(foo.Name, metav1.NewDeleteOptions(0))
   			Expect(err2).NotTo(HaveOccurred())
   		}()
               // creates the Ingress Object
-  		_, err := cs.Core().Foo(ns).Create(foo)
+  		_, err := cs.CoreV1().Foo(ns).Create(foo)
   		Expect(err).NotTo(HaveOccurred())
   	})
   })
@@ -113,10 +113,10 @@ scratch and test the Kubernetes type Foo.
   defer func() {
   	By("deleting the pod")
   	defer GinkgoRecover()
-  	err2 := cs.Core().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0))
+  	err2 := cs.CoreV1().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0))
   	Expect(err2).NotTo(HaveOccurred())
   }()
-  _, err = cs.Core().Pods(ns).Create(pod)
+  _, err = cs.CoreV1().Pods(ns).Create(pod)
   Expect(err).NotTo(HaveOccurred())
   framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
 ```
@@ -137,10 +137,10 @@ scratch and test the Kubernetes type Foo.
   defer func() {
   	By("deleting the service")
   	defer GinkgoRecover()
-  	err2 := cs.Core().Services(ns).Delete(service.Name, metav1.NewDeleteOptions(0))
+  	err2 := cs.CoreV1().Services(ns).Delete(service.Name, metav1.NewDeleteOptions(0))
   	Expect(err2).NotTo(HaveOccurred())
   }()
-  _, err := cs.Core().Services(ns).Create(service)
+  _, err := cs.CoreV1().Services(ns).Create(service)
   Expect(err).NotTo(HaveOccurred())
 ```
 
@@ -163,14 +163,14 @@ Create Kubernetes ingress object:
   defer func() {
   	By("deleting the ingress")
   	defer GinkgoRecover()
-  	err2 := cs.Extensions().Ingresses(ns).Delete(ing.Name, metav1.NewDeleteOptions(0))
+  	err2 := cs.ExtensionsV1beta1().Ingresses(ns).Delete(ing.Name, metav1.NewDeleteOptions(0))
   	Expect(err2).NotTo(HaveOccurred())
   }()
-  ingressCreate, err := cs.Extensions().Ingresses(ns).Create(ing)
+  ingressCreate, err := cs.ExtensionsV1beta1().Ingresses(ns).Create(ing)
   Expect(err).NotTo(HaveOccurred())
   addr, err := jig.WaitForIngressAddress(cs, ns, ingressCreate.Name, 3*time.Minute)
   Expect(err).NotTo(HaveOccurred())
-  ingress, err := cs.Extensions().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"})
+  ingress, err := cs.ExtensionsV1beta1().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"})
   Expect(err).NotTo(HaveOccurred())
   By(fmt.Sprintf("ALB endpoint from ingress status: %s", ingress.Status.LoadBalancer.Ingress[0].Hostname))
 ```

diff --git a/test/e2e/apiserver.go b/test/e2e/apiserver.go
@@ -54,7 +54,7 @@ var _ = framework.KubeDescribe("API Server webhook tests", func() {
 		defer func() {
 			By(fmt.Sprintf("Delete a compliant deployment: %s", deployment.Name))
 			defer GinkgoRecover()
-			err := cs.Extensions().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0))
+			err := cs.ExtensionsV1beta1().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0))
 			Expect(err).NotTo(HaveOccurred())
 		}()
 		Expect(err).NotTo(HaveOccurred())
@@ -84,7 +84,7 @@ var _ = framework.KubeDescribe("API Server webhook tests", func() {
 		defer func() {
 			By(fmt.Sprintf("Delete a compliant deployment: %s", deployment.Name))
 			defer GinkgoRecover()
-			err := cs.Extensions().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0))
+			err := cs.ExtensionsV1beta1().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0))
 			Expect(err).NotTo(HaveOccurred())
 		}()
 		err = framework.WaitForDeploymentWithCondition(cs, ns, deployment.Name, "FailedCreate", appsv1.DeploymentReplicaFailure)

diff --git a/test/e2e/audit.go b/test/e2e/audit.go
@@ -118,10 +118,10 @@ func expectEvents(f *framework.Framework, expectedEvents []utils.AuditEvent) {
 		missingReport, err := utils.CheckAuditLines(stream, expectedEvents, auditv1.SchemeGroupVersion)
 		if err != nil {
 			framework.Logf("Failed to observe audit events: %v", err)
-		} else if len(missingReport) > 0 {
+		} else if len(missingReport.MissingEvents) > 0 {
 			framework.Logf("Events %#v not found!", missingReport)
 		}
-		return len(missingReport) == 0, nil
+		return len(missingReport.MissingEvents) == 0, nil
 	})
 	framework.ExpectNoError(err, "after %v failed to observe audit events", pollingTimeout)
 }
diff --git a/test/e2e/egress.go b/test/e2e/egress.go
@@ -50,10 +50,10 @@ var _ = framework.KubeDescribe("Static Egress creation", func() {
 		defer func() {
 			By("deleting the pod")
 			defer GinkgoRecover()
-			cs.Core().Pods(ns).Delete(pingPod.Name, metav1.NewDeleteOptions(0))
+			cs.CoreV1().Pods(ns).Delete(pingPod.Name, metav1.NewDeleteOptions(0))
 			// don't care about POD deletion, because it should exit by itself
 		}()
-		_, err := cs.Core().Pods(ns).Create(pingPod)
+		_, err := cs.CoreV1().Pods(ns).Create(pingPod)
 		Expect(err).NotTo(HaveOccurred())
 		framework.ExpectNoError(f.WaitForPodRunning(pingPod.Name))
 
@@ -63,15 +63,15 @@ var _ = framework.KubeDescribe("Static Egress creation", func() {
 		defer func() {
 			By("deleting the configmap")
 			defer GinkgoRecover()
-			err2 := cs.Core().ConfigMaps(ns).Delete(cmap.Name, metav1.NewDeleteOptions(0))
+			err2 := cs.CoreV1().ConfigMaps(ns).Delete(cmap.Name, metav1.NewDeleteOptions(0))
 			Expect(err2).NotTo(HaveOccurred())
 		}()
-		_, err = cs.Core().ConfigMaps(ns).Create(cmap)
+		_, err = cs.CoreV1().ConfigMaps(ns).Create(cmap)
 		Expect(err).NotTo(HaveOccurred())
 
 		// wait for egress route and NAT GWs ready and POD exit code 0 vs 2
 		for {
-			p, err := cs.Core().Pods(ns).Get(pingPod.Name, metav1.GetOptions{})
+			p, err := cs.CoreV1().Pods(ns).Get(pingPod.Name, metav1.GetOptions{})
 			if err != nil {
 				Expect(fmt.Errorf("Could not get POD %s", pingPod.Name)).NotTo(HaveOccurred())
 				return

diff --git a/test/e2e/external_dns.go b/test/e2e/external_dns.go
@@ -50,26 +50,26 @@ var _ = framework.KubeDescribe("External DNS creation", func() {
 
 		By("Creating service " + serviceName + " in namespace " + ns)
 		defer func() {
-			err := cs.Core().Services(ns).Delete(serviceName, nil)
+			err := cs.CoreV1().Services(ns).Delete(serviceName, nil)
 			Expect(err).NotTo(HaveOccurred())
 		}()
 
 		hostName := fmt.Sprintf("%s-%d.%s", serviceName, time.Now().UTC().Unix(), E2EHostedZone())
 		service := createServiceTypeLoadbalancer(serviceName, hostName, labels, port)
 
-		_, err := cs.Core().Services(ns).Create(service)
+		_, err := cs.CoreV1().Services(ns).Create(service)
 		Expect(err).NotTo(HaveOccurred())
 
 		By("Submitting the pod to kubernetes")
 		pod := createNginxPod(nameprefix, ns, labels, port)
 		defer func() {
 			By("deleting the pod")
 			defer GinkgoRecover()
-			err2 := cs.Core().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0))
+			err2 := cs.CoreV1().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0))
 			Expect(err2).NotTo(HaveOccurred())
 		}()
 
-		_, err = cs.Core().Pods(ns).Create(pod)
+		_, err = cs.CoreV1().Pods(ns).Create(pod)
 		Expect(err).NotTo(HaveOccurred())
 
 		framework.ExpectNoError(f.WaitForPodRunning(pod.Name))