update admission-controller and merge Service Type LoadBalancer tests

Author: Martin Linkhorst

cluster/manifests/02-admission-control/deployment.yaml

@@ -33,7 +33,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
       - name: admission-controller
-        image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/staging_namespace/teapot/admission-controller:pr-293-1
+        image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-253
         lifecycle:
           preStop:
             exec:

test/e2e/external_dns.go

@@ -53,63 +53,7 @@ var _ = describe("External DNS creation", func() {
 		jigi = ingress.NewIngressTestJig(f.ClientSet)
 	})
 
-	f.It("Should create DNS entry via Service and AWS Cloud Provider [Zalando]", f.WithSlow(), func(ctx context.Context) {
-		nameprefix := serviceName + "-"
-		ns := f.Namespace.Name
-		labels := map[string]string{
-			"foo": "bar",
-			"baz": "blah",
-		}
-		port := 80
-
-		By("Creating service " + serviceName + " in namespace " + ns)
-		defer func() {
-			err := cs.CoreV1().Services(ns).Delete(ctx, serviceName, metav1.DeleteOptions{})
-			framework.ExpectNoError(err, "failed to delete service: %s in namespace: %s", serviceName, ns)
-		}()
-
-		hostName := fmt.Sprintf("%s-%d.%s", serviceName, time.Now().UTC().Unix(), E2EHostedZone())
-		_, err := jigs.CreateLoadBalancerService(ctx, timeout, func(svc *v1.Service) {
-			svc.ObjectMeta = metav1.ObjectMeta{
-				Name: serviceName,
-				Annotations: map[string]string{
-					externalDNSAnnotation: hostName,
-				},
-			}
-			svc.Spec.Type = v1.ServiceTypeLoadBalancer
-			svc.Spec.Selector = labels
-			svc.Spec.Ports = []v1.ServicePort{
-				{
-					Port:       int32(port),
-					TargetPort: intstr.FromInt(port),
-				},
-			}
-		})
-		framework.ExpectNoError(err, "failed to create service: %s in namespace: %s", serviceName, ns)
-
-		By("Submitting the pod to kubernetes")
-		route := fmt.Sprintf(`* -> inlineContent("%s") -> <shunt>`, "OK")
-		pod := createSkipperPod(nameprefix, ns, route, labels, port)
-		defer func() {
-			By("deleting the pod")
-			defer GinkgoRecover()
-			err2 := cs.CoreV1().Pods(ns).Delete(ctx, pod.Name, metav1.DeleteOptions{})
-			framework.ExpectNoError(err2, "failed to delete pod: %s in namespace: %s", pod.Name, ns)
-		}()
-
-		_, err = cs.CoreV1().Pods(ns).Create(ctx, pod, metav1.CreateOptions{})
-		framework.ExpectNoError(err, "failed to create pod: %s in namespace: %s", pod.Name, ns)
-
-		framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(ctx, f.ClientSet, pod.Name, pod.Namespace),
-			"failed to wait for pod: %s in namespace: %s", pod.Name, ns)
-
-		// wait for DNS and for pod to be reachable.
-		By("Waiting up to " + timeout.String() + " for " + hostName + " to be reachable")
-		err = waitForSuccessfulResponse(hostName, timeout)
-		framework.ExpectNoError(err, "failed to wait for %s to be reachable", hostName)
-	})
-
-	f.It("Should create DNS entry via Service and AWS Load Balancer Controller [Zalando]", f.WithSlow(), func(ctx context.Context) {
+	f.It("Should create DNS entry via Service [Zalando]", f.WithSlow(), func(ctx context.Context) {
 		nameprefix := serviceName + "-"
 		ns := f.Namespace.Name
 		labels := map[string]string{

test/e2e/run_e2e.sh

@@ -205,7 +205,6 @@ if [ "$e2e" = true ]; then
         # some tests are skipped for zalando-aws because they only apply to zalando-eks
         SKIPPED_TESTS+=(
             "Authorization via admission-controller \[RBAC\] \[Zalando\]"
-            "Should create DNS entry via Service and AWS Load Balancer Controller \[Zalando\]" # Depends on availability of AWS Load Balancer Controller in the cluster.
         )
     fi
 
@@ -216,7 +215,6 @@ if [ "$e2e" = true ]; then
             "Should audit API calls to create, update, patch, delete pods. \[Audit\] \[Zalando\]"
             "should validate permissions for \[Authorization\] \[RBAC\] \[Zalando\]" # TODO: Remains skipped until we remove the older RBAC setup
             "should creating a working mysql cluster" # upstream test which does not work with IPv6
-            "Should create DNS entry via Service and AWS Cloud Provider \[Zalando\]" # Legacy Service Type LoadBalancer controller doesn't support IPv6.
         )
     fi