Remove ingress-nginx default backend

It's not needed since nginx 0.20.0. See the following pull-requests for context: * kubernetes/ingress-nginx#3126 * kubernetes/ingress-nginx#3156
medyagh · Aug 1, 2019 · de27472 · de27472
1 parent 2614069
commit de27472
Show file tree

Hide file tree

Showing 5 changed files with 445 additions and 89 deletions.
diff --git a/deploy/addons/ingress/ingress-dp.yaml.tmpl b/deploy/addons/ingress/ingress-dp.yaml.tmpl
@@ -12,51 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: default-http-backend
-  namespace: kube-system
-  labels:
-    app.kubernetes.io/name: default-http-backend
-    app.kubernetes.io/part-of: kube-system
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: default-http-backend
-      addonmanager.kubernetes.io/mode: Reconcile
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: default-http-backend
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      terminationGracePeriodSeconds: 60
-      containers:
-      - name: default-http-backend
-        # Any image is permissible as long as:
-        # 1. It serves a 404 page at /
-        # 2. It serves 200 on a /healthz endpoint        
-        image: {{default "gcr.io/google_containers" .ImageRepository}}/defaultbackend{{.ExoticArch}}:1.4
-        imagePullPolicy: IfNotPresent
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
-        ports:
-        - containerPort: 8080
-        resources:
-          limits:
-            cpu: 20m
-            memory: 30Mi
-          requests:
-            cpu: 20m
-            memory: 30Mi
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -121,7 +76,6 @@ spec:
           hostPort: 18080
         args:
         - /nginx-ingress-controller
-        - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
         - --configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf
         - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
         - --udp-services-configmap=$(POD_NAMESPACE)/udp-services

diff --git a/deploy/addons/ingress/ingress-svc.yaml.tmpl b/deploy/addons/ingress/ingress-svc.yaml.tmpl
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
@@ -220,12 +220,6 @@ var Addons = map[string]*Addon{
 			"ingress-dp.yaml",
 			"0640",
 			true),
-		MustBinAsset(
-			"deploy/addons/ingress/ingress-svc.yaml.tmpl",
-			constants.AddonsPath,
-			"ingress-svc.yaml",
-			"0640",
-			false),
 	}, false, "ingress"),
 	"metrics-server": NewAddon([]*BinAsset{
 		MustBinAsset(

diff --git a/test/integration/fn_addons.go b/test/integration/fn_addons.go
@@ -130,10 +130,6 @@ func testIngressController(t *testing.T) {
 		t.Fatalf("Failed waiting for ingress-controller to be up: %v", err)
 	}
 
-	if err := util.WaitForIngressDefaultBackendRunning(t, p); err != nil {
-		t.Fatalf("Failed waiting for default-http-backend to be up: %v", err)
-	}
-
 	ingressPath := filepath.Join(*testdataDir, "nginx-ing.yaml")
 	if _, err := kr.RunCommand([]string{"create", "-f", ingressPath}); err != nil {
 		t.Fatalf("Failed creating nginx ingress resource: %v", err)