Add --disable-catch-all option to disable catch-all server

test/e2e/framework/framework.go

@@ -352,6 +352,21 @@ func UpdateDeployment(kubeClientSet kubernetes.Interface, namespace string, name
 	return nil
 }
 
+// UpdateIngress runs the given updateFunc on the ingress
+func UpdateIngress(kubeClientSet kubernetes.Interface, namespace string, name string, updateFunc func(d *extensions.Ingress) error) error {
+	ingress, err := kubeClientSet.ExtensionsV1beta1().Ingresses(namespace).Get(name, metav1.GetOptions{})
+	if err != nil {
+		return err
+	}
+
+	if err := updateFunc(ingress); err != nil {
+		return err
+	}
+
+	_, err = kubeClientSet.ExtensionsV1beta1().Ingresses(namespace).Update(ingress)
+	return err
+}
+
 // NewSingleIngressWithTLS creates a simple ingress rule with TLS spec included
 func NewSingleIngressWithTLS(name, path, host, ns, service string, port int, annotations *map[string]string) *extensions.Ingress {
 	return newSingleIngressWithRules(name, path, host, ns, service, port, annotations, true)

test/e2e/settings/disable_catch_all.go

@@ -0,0 +1,109 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package settings
+
+import (
+	"strings"
+
+	. "github.com/onsi/ginkgo"
+	appsv1beta1 "k8s.io/api/apps/v1beta1"
+
+	"k8s.io/ingress-nginx/test/e2e/framework"
+)
+
+var _ = framework.IngressNginxDescribe("Disabled catch-all", func() {
+	f := framework.NewDefaultFramework("disabled-catch-all")
+
+	BeforeEach(func() {
+		f.NewEchoDeploymentWithReplicas(1)
+
+		framework.UpdateDeployment(f.KubeClientSet, f.IngressController.Namespace, "nginx-ingress-controller", 1,
+			func(deployment *appsv1beta1.Deployment) error {
+				args := deployment.Spec.Template.Spec.Containers[0].Args
+				args = append(args, "--disable-catch-all=true")
+				deployment.Spec.Template.Spec.Containers[0].Args = args
+				_, err := f.KubeClientSet.AppsV1beta1().Deployments(f.IngressController.Namespace).Update(deployment)
+
+				return err
+			})
+	})
+
+	AfterEach(func() {
+	})
+
+	It("should ignore catch all Ingress", func() {
+		host := "foo"
+
+		ing := framework.NewSingleCatchAllIngress("catch-all", f.IngressController.Namespace, "http-svc", 80, nil)
+		f.EnsureIngress(ing)
+
+		ing = framework.NewSingleIngress(host, "/", host, f.IngressController.Namespace, "http-svc", 80, nil)
+		f.EnsureIngress(ing)
+
+		f.WaitForNginxServer(host, func(cfg string) bool {
+			return strings.Contains(cfg, "server_name foo")
+		})
+
+		f.WaitForNginxServer("_", func(cfg string) bool {
+			return strings.Contains(cfg, `set $ingress_name ""`) &&
+				strings.Contains(cfg, `set $proxy_upstream_name "upstream-default-backend"`)
+		})
+	})
+
+	// FIXME: This test doesn't work because of a bug in Ingress update handle in store package.
+	// It("should delete Ingress updated to catch-all", func() {
+	// 	host := "foo"
+
+	// 	ing := framework.NewSingleIngress(host, "/", host, f.IngressController.Namespace, "http-svc", 80, nil)
+	// 	f.EnsureIngress(ing)
+
+	// 	f.WaitForNginxServer(host,
+	// 		func(server string) bool {
+	// 			return strings.Contains(server, "server_name foo")
+	// 		})
+
+	// 	resp, _, errs := gorequest.New().
+	// 		Get(f.IngressController.HTTPURL).
+	// 		Set("Host", host).
+	// 		End()
+	// 	Expect(errs).To(BeNil())
+	// 	Expect(resp.StatusCode).Should(Equal(http.StatusOK))
+
+	// 	err := framework.UpdateIngress(f.KubeClientSet, f.IngressController.Namespace, host, func(ingress *extensions.Ingress) error {
+	// 		ingress.Spec.Rules = nil
+	// 		ingress.Spec.Backend = &extensions.IngressBackend{
+	// 			ServiceName: "http-svc",
+	// 			ServicePort: intstr.FromInt(80),
+	// 		}
+	// 		return nil
+	// 	})
+	// 	Expect(err).ToNot(HaveOccurred())
+
+	// 	f.WaitForNginxConfiguration(func(cfg string) bool {
+	// 		return !strings.Contains(cfg, "server_name foo") &&
+	// 			!strings.Contains(cfg, `set $ingress_name "foo"`) &&
+	// 			!strings.Contains(cfg, `set $service_name "http-svc"`)
+	// 	})
+
+	// 	resp, _, errs = gorequest.New().
+	// 		Get(f.IngressController.HTTPURL).
+	// 		Set("Host", host).
+	// 		End()
+	// 	Expect(errs).To(BeNil())
+	// 	Expect(resp.StatusCode).Should(Equal(http.StatusNotFound))
+	// })
+})