MINOR: switch default namespace to haproxy-controller in yaml files

Author: ivanmatmati

deploy/haproxy-ingress-daemonset.yaml

@@ -9,7 +9,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 
 ---
 kind: ClusterRole
@@ -83,22 +83,22 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: haproxy-kubernetes-ingress
 subjects:
 - kind: ServiceAccount
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 data:
 
 ---
@@ -108,7 +108,7 @@ metadata:
   labels:
     run: ingress-default-backend
   name: haproxy-kubernetes-ingress-default-backend
-  namespace: default
+  namespace: haproxy-controller
 spec:
   replicas: 1
   selector:
@@ -132,7 +132,7 @@ metadata:
   labels:
     run: ingress-default-backend
   name: haproxy-kubernetes-ingress-default-backend
-  namespace: default
+  namespace: haproxy-controller
 spec:
   selector:
     run: ingress-default-backend
@@ -149,7 +149,7 @@ metadata:
   labels:
     run: haproxy-ingress
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 spec:
   selector:
     matchLabels:
@@ -219,7 +219,7 @@ metadata:
   labels:
     run: haproxy-ingress
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 spec:
   selector:
     run: haproxy-ingress

deploy/haproxy-ingress.yaml

@@ -9,7 +9,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 
 ---
 kind: ClusterRole
@@ -83,22 +83,22 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: haproxy-kubernetes-ingress
 subjects:
 - kind: ServiceAccount
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: haproxy
-  namespace: default
+  namespace: haproxy-controller
 data:
 
 ---
@@ -108,7 +108,7 @@ metadata:
   labels:
     run: ingress-default-backend
   name: haproxy-kubernetes-ingress-default-backend
-  namespace: default
+  namespace: haproxy-controller
 spec:
   replicas: 1
   selector:
@@ -132,7 +132,7 @@ metadata:
   labels:
     run: ingress-default-backend
   name: haproxy-kubernetes-ingress-default-backend
-  namespace: default
+  namespace: haproxy-controller
 spec:
   selector:
     run: ingress-default-backend
@@ -149,7 +149,7 @@ metadata:
   labels:
     run: haproxy-ingress
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 spec:
   replicas: 1
   selector:
@@ -217,7 +217,7 @@ metadata:
   labels:
     run: haproxy-ingress
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 spec:
   selector:
     run: haproxy-ingress

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

@@ -4,7 +4,7 @@ metadata:
   labels:
     run: default-backend
   name: haproxy-kubernetes-ingress-default-backend
-  namespace: default
+  namespace: haproxy-controller
 spec:
   replicas: 1
   selector:
@@ -14,7 +14,7 @@ spec:
     metadata:
       labels:
         run: default-backend
-        namespace: default
+        namespace: haproxy-controller
     spec:
       containers:
         - name: default-backend
@@ -28,7 +28,7 @@ metadata:
   labels:
     run: default-backend
   name: haproxy-kubernetes-ingress-default-backend
-  namespace: default
+  namespace: haproxy-controller
 spec:
   ports:
   - name: port-1

deploy/tests/config/2.rbac.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: haproxy-kubernetes-ingress
- namespace: default
+ namespace: haproxy-controller
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -88,12 +88,12 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: haproxy-kubernetes-ingress
 subjects:
 - kind: ServiceAccount
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller

deploy/tests/config/3.configmap.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: haproxy-kubernetes-ingress
- namespace: default
+ namespace: haproxy-controller
 data:
   global-config-snippet: |
     stats socket 0.0.0.0:31024

deploy/tests/config/4.ingress-controller.yaml

@@ -4,7 +4,7 @@ metadata:
  labels:
    run: haproxy-ingress
  name: haproxy-kubernetes-ingress
- namespace: default
+ namespace: haproxy-controller
 spec:
  replicas: 1
  selector:
@@ -75,7 +75,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: haproxy-kubernetes-ingress
-  namespace: default
+  namespace: haproxy-controller
 spec:
   selector:
     run: haproxy-ingress

deploy/tests/create.sh

@@ -42,13 +42,13 @@ echo "wait --for=condition=ready ..."
 COUNTER=0
 while [  $COUNTER -lt 150 ]; do
     sleep 2
-    kubectl get pods -n default --no-headers --selector=run=haproxy-ingress | awk '{print "default/haproxy-kubernetes-ingress " $3 " " $5}'
-    result=$(kubectl get pods -n default  --no-headers --selector=run=haproxy-ingress | awk '{print $3}')
+    kubectl get pods -n haproxy-controller --no-headers --selector=run=haproxy-ingress | awk '{print "haproxy-controller/haproxy-kubernetes-ingress " $3 " " $5}'
+    result=$(kubectl get pods -n haproxy-controller  --no-headers --selector=run=haproxy-ingress | awk '{print $3}')
     if [ "$result" = "Running" ]; then
       COUNTER=151
     else
       COUNTER=`expr $COUNTER + 1`
     fi
 done
 
-kubectl wait --for=condition=ready --timeout=10s pod -l run=haproxy-ingress -n default
+kubectl wait --for=condition=ready --timeout=10s pod -l run=haproxy-ingress -n haproxy-controller

deploy/tests/e2e/config-snippet/config/configmap.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: haproxy-kubernetes-ingress
- namespace: default
+ namespace: haproxy-controller
 data:
   frontend-config-snippet: |
     unique-id-format %{+X}o\ %ci:%cp_%fi:%fp_%Ts_%rt:%pid

deploy/tests/e2e/endpoints/config/tcp.yaml

@@ -3,6 +3,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: haproxy-kubernetes-ingress-tcp
- namespace: default
+ namespace: haproxy-controller
 data:
   32766: "e2e-tests-endpoints/http-echo:443"

deploy/tests/e2e/global-config/config/configmap-maxconn.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: haproxy-kubernetes-ingress
- namespace: default
+ namespace: haproxy-controller
 data:
   # Mandatory config
   global-config-snippet: |

deploy/tests/e2e/global-config/config/configmap-pp-1.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
- name: haproxy-configmap
+ name: haproxy-kubernetes-ingress
  namespace: haproxy-controller
 data:
   # Mandatory config

deploy/tests/e2e/global-config/config/configmap-pp-2.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
- name: haproxy-configmap
+ name: haproxy-kubernetes-ingress
  namespace: haproxy-controller
 data:
   # Mandatory config

deploy/tests/e2e/global-config/suite_test.go

@@ -36,6 +36,10 @@ func (suite *GlobalConfigSuite) SetupSuite() {
 	suite.NoError(err)
 }
 
+func (suite *GlobalConfigSuite) TearDownSuite() {
+	suite.test.TearDown()
+}
+
 func TestGlobalConfigSuite(t *testing.T) {
 	suite.Run(t, new(GlobalConfigSuite))
 }

deploy/tests/e2e/tls-auth/config/client-auth.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
  name: haproxy-kubernetes-ingress
- namespace: default
+ namespace: haproxy-controller
 data:
   ssl-certificate: e2e-tests-tls-auth/default-cert
   client-ca: e2e-tests-tls-auth/client-ca

documentation/controller.md

@@ -66,7 +66,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: tcp
-  namespace: default
+  namespace: haproxy-controller
 data:
   3306:                    # Port where the frontend is going to listen to.
     mysql-ns/mysql:3306    # Kubernetes service in the format NS/ServiceName:ServicePort
@@ -104,7 +104,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: errorfile
-  namespace: default
+  namespace: haproxy-controller
 data:
   503: |-
     HTTP/1.0 503 Service Unavailable
@@ -162,7 +162,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: acls-patterns
-  namespace: default
+  namespace: haproxy-controller
 data:
   ips: |
     127.0.0.1

documentation/doc.yaml

@@ -20,7 +20,7 @@ image_arguments:
       kind: ConfigMap
       metadata:
         name: tcp
-        namespace: default
+        namespace: haproxy-controller
       data:
         3306:                    # Port where the frontend is going to listen to.
           mysql-ns/mysql:3306    # Kubernetes service in the format NS/ServiceName:ServicePort
@@ -46,7 +46,7 @@ image_arguments:
       kind: ConfigMap
       metadata:
         name: errorfile
-        namespace: default
+        namespace: haproxy-controller
       data:
         503: |-
           HTTP/1.0 503 Service Unavailable
@@ -94,7 +94,7 @@ image_arguments:
       kind: ConfigMap
       metadata:
         name: acls-patterns
-        namespace: default
+        namespace: haproxy-controller
       data:
         ips: |
           127.0.0.1
@@ -138,7 +138,7 @@ image_arguments:
   - argument: --ingress.class
     description: A name to assign to the ingress controller so that Ingress objects can target it apart from other running ingress controllers.
     tip:
-      - In kubernetes 1.18+, a new `IngressClass` resource can be referenced by Ingress objects to target an Ingress Controller.   
+      - In kubernetes 1.18+, a new `IngressClass` resource can be referenced by Ingress objects to target an Ingress Controller.
         More details can be found in the [IngressClass doc entry](./ingressclass.md).
     values:
       - The name of the ingress class
@@ -933,7 +933,7 @@ annotations:
     description:
       - Identifies the ingress controller to be used. If this value is the same as the [--ingress.class](./controller.md#--ingressclass) controller arg, the ingress resource will be processed.
     tip:
-      - In kubernetes 1.18+, a new `IngressClass` resource can be referenced by Ingress objects to target an Ingress Controller.   
+      - In kubernetes 1.18+, a new `IngressClass` resource can be referenced by Ingress objects to target an Ingress Controller.
         More details can be found in the [IngressClass doc entry](./ingressclass.md).
       - In case both `ingress.class` annotation and `ingressClassName` are used, `ingress.class` will have precedence.
     values: