TEST/MEDIUM: Use the builtin HTTP server as default backend

Author: oliwer

deploy/haproxy-ingress-daemonset.yaml

@@ -101,47 +101,6 @@ metadata:
   namespace: haproxy-controller
 data:
 
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    run: ingress-default-backend
-  name: haproxy-kubernetes-ingress-default-backend
-  namespace: haproxy-controller
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      run: ingress-default-backend
-  template:
-    metadata:
-      labels:
-        run: ingress-default-backend
-    spec:
-      containers:
-      - name: ingress-default-backend
-        image: gcr.io/google_containers/defaultbackend:1.0
-        ports:
-        - containerPort: 8080
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    run: ingress-default-backend
-  name: haproxy-kubernetes-ingress-default-backend
-  namespace: haproxy-controller
-spec:
-  selector:
-    run: ingress-default-backend
-  ports:
-  - name: port-1
-    port: 8080
-    protocol: TCP
-    targetPort: 8080
-
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -165,7 +124,6 @@ spec:
         image: haproxytech/kubernetes-ingress
         args:
           - --configmap=haproxy-controller/haproxy-kubernetes-ingress
-          - --default-backend-service=haproxy-controller/haproxy-kubernetes-ingress-default-backend
         securityContext:
           runAsUser:  1000
           runAsGroup: 1000

deploy/haproxy-ingress.yaml

@@ -101,47 +101,6 @@ metadata:
   namespace: haproxy-controller
 data:
 
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    run: ingress-default-backend
-  name: haproxy-kubernetes-ingress-default-backend
-  namespace: haproxy-controller
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      run: ingress-default-backend
-  template:
-    metadata:
-      labels:
-        run: ingress-default-backend
-    spec:
-      containers:
-      - name: ingress-default-backend
-        image: gcr.io/google_containers/defaultbackend:1.0
-        ports:
-        - containerPort: 8080
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    run: ingress-default-backend
-  name: haproxy-kubernetes-ingress-default-backend
-  namespace: haproxy-controller
-spec:
-  selector:
-    run: ingress-default-backend
-  ports:
-  - name: port-1
-    port: 8080
-    protocol: TCP
-    targetPort: 8080
-
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -166,7 +125,6 @@ spec:
         image: haproxytech/kubernetes-ingress
         args:
           - --configmap=haproxy-controller/haproxy-kubernetes-ingress
-          - --default-backend-service=haproxy-controller/haproxy-kubernetes-ingress-default-backend
         securityContext:
           runAsUser:  1000
           runAsGroup: 1000

deploy/tests/config/1.default-backend.yaml

@@ -26,7 +26,6 @@ spec:
          requests:
            memory: 256Mi
        args:
-       - --default-backend-service=$(POD_NAMESPACE)/haproxy-kubernetes-ingress-default-backend
        - --configmap=$(POD_NAMESPACE)/haproxy-kubernetes-ingress
        - --configmap-tcp-services=$(POD_NAMESPACE)/haproxy-kubernetes-ingress-tcp
        - --configmap-errorfiles=$(POD_NAMESPACE)/errorfiles

deploy/tests/config/2.rbac.yaml renamed to deploy/tests/config/1.rbac.yaml

@@ -37,10 +37,9 @@ kind load docker-image haproxytech/http-echo:latest  --name=$clustername
 
 echo "deploying Ingress Controller ..."
 kubectl apply -f $DIR/config/0.namespace.yaml
-kubectl apply -f $DIR/config/1.default-backend.yaml
-kubectl apply -f $DIR/config/2.rbac.yaml
-kubectl apply -f $DIR/config/3.configmap.yaml
-kubectl apply -f $DIR/config/4.ingress-controller.yaml
+kubectl apply -f $DIR/config/1.rbac.yaml
+kubectl apply -f $DIR/config/2.configmap.yaml
+kubectl apply -f $DIR/config/3.ingress-controller.yaml
 
 echo "wait --for=condition=ready ..."
 COUNTER=0

deploy/tests/config/3.configmap.yaml renamed to deploy/tests/config/2.configmap.yaml

@@ -204,6 +204,7 @@ args:
 ### `--default-backend-service`
 
   The name of the Kubernetes service to send requests to when no Ingress rules match.
+By default, it uses the builtin HTTP backend.
 
 Possible values:
 

deploy/tests/config/4.ingress-controller.yaml renamed to deploy/tests/config/3.ingress-controller.yaml

@@ -120,7 +120,9 @@ image_arguments:
       args:
         - --configmap-patternfiles=default/acl-patterns
   - argument: --default-backend-service
-    description: The name of the Kubernetes service to send requests to when no Ingress rules match.
+    description: |-
+      The name of the Kubernetes service to send requests to when no Ingress rules match.
+      By default, it uses the builtin HTTP backend.
     values:
       - The name of the backend service
     version_min: "1.4"