MINOR: sync k8s resources names with Helm project

Author: ivanmatmati

deploy/haproxy-ingress-daemonset.yaml

@@ -8,14 +8,14 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: haproxy-ingress-service-account
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: haproxy-ingress-cluster-role
+  name: haproxy-kubernetes-ingress
 rules:
 - apiGroups:
   - ""
@@ -82,22 +82,22 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: haproxy-ingress-cluster-role-binding
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: haproxy-ingress-cluster-role
+  name: haproxy-kubernetes-ingress
 subjects:
 - kind: ServiceAccount
-  name: haproxy-ingress-service-account
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: haproxy-configmap
+  name: haproxy-kubernetes-ingress
   namespace: default
 data:
 
@@ -107,8 +107,8 @@ kind: Deployment
 metadata:
   labels:
     run: ingress-default-backend
-  name: ingress-default-backend
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress-default-backend
+  namespace: default
 spec:
   replicas: 1
   selector:
@@ -131,8 +131,8 @@ kind: Service
 metadata:
   labels:
     run: ingress-default-backend
-  name: ingress-default-backend
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress-default-backend
+  namespace: default
 spec:
   selector:
     run: ingress-default-backend
@@ -148,8 +148,8 @@ kind: DaemonSet
 metadata:
   labels:
     run: haproxy-ingress
-  name: haproxy-ingress
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 spec:
   selector:
     matchLabels:
@@ -159,13 +159,13 @@ spec:
       labels:
         run: haproxy-ingress
     spec:
-      serviceAccountName: haproxy-ingress-service-account
+      serviceAccountName: haproxy-kubernetes-ingress
       containers:
       - name: haproxy-ingress
         image: haproxytech/kubernetes-ingress
         args:
-          - --configmap=default/haproxy-configmap
-          - --default-backend-service=haproxy-controller/ingress-default-backend
+          - --configmap=default/haproxy-kubernetes-ingress
+          - --default-backend-service=default/haproxy-kubernetes-ingress-default-backend
         securityContext:
           runAsUser:  1000
           runAsGroup: 1000
@@ -218,8 +218,8 @@ kind: Service
 metadata:
   labels:
     run: haproxy-ingress
-  name: haproxy-ingress
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 spec:
   selector:
     run: haproxy-ingress

deploy/haproxy-ingress.yaml

@@ -8,14 +8,14 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: haproxy-ingress-service-account
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: haproxy-ingress-cluster-role
+  name: haproxy-kubernetes-ingress
 rules:
 - apiGroups:
   - ""
@@ -82,23 +82,23 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: haproxy-ingress-cluster-role-binding
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: haproxy-ingress-cluster-role
+  name: haproxy-kubernetes-ingress
 subjects:
 - kind: ServiceAccount
-  name: haproxy-ingress-service-account
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: haproxy
-  namespace: haproxy-controller
+  namespace: default
 data:
 
 ---
@@ -107,8 +107,8 @@ kind: Deployment
 metadata:
   labels:
     run: ingress-default-backend
-  name: ingress-default-backend
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress-default-backend
+  namespace: default
 spec:
   replicas: 1
   selector:
@@ -131,8 +131,8 @@ kind: Service
 metadata:
   labels:
     run: ingress-default-backend
-  name: ingress-default-backend
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress-default-backend
+  namespace: default
 spec:
   selector:
     run: ingress-default-backend
@@ -148,8 +148,8 @@ kind: Deployment
 metadata:
   labels:
     run: haproxy-ingress
-  name: haproxy-ingress
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 spec:
   replicas: 1
   selector:
@@ -160,13 +160,13 @@ spec:
       labels:
         run: haproxy-ingress
     spec:
-      serviceAccountName: haproxy-ingress-service-account
+      serviceAccountName: haproxy-kubernetes-ingress
       containers:
       - name: haproxy-ingress
         image: haproxytech/kubernetes-ingress
         args:
-          - --configmap=haproxy-controller/haproxy
-          - --default-backend-service=haproxy-controller/ingress-default-backend
+          - --configmap=default/haproxy-kubernetes-ingress
+          - --default-backend-service=default/haproxy-kubernetes-ingress-default-backend
         securityContext:
           runAsUser:  1000
           runAsGroup: 1000
@@ -216,8 +216,8 @@ kind: Service
 metadata:
   labels:
     run: haproxy-ingress
-  name: haproxy-ingress
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 spec:
   selector:
     run: haproxy-ingress

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

@@ -3,8 +3,8 @@ kind: Deployment
 metadata:
   labels:
     run: default-backend
-  name: default-backend
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress-default-backend
+  namespace: default
 spec:
   replicas: 1
   selector:
@@ -14,7 +14,7 @@ spec:
     metadata:
       labels:
         run: default-backend
-        namespace: haproxy-controller
+        namespace: default
     spec:
       containers:
         - name: default-backend
@@ -27,8 +27,8 @@ kind: Service
 metadata:
   labels:
     run: default-backend
-  name: default-backend
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress-default-backend
+  namespace: default
 spec:
   ports:
   - name: port-1

deploy/tests/config/2.rbac.yaml

@@ -2,13 +2,13 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
- name: haproxy-ingress-service-account
- namespace: haproxy-controller
+ name: haproxy-kubernetes-ingress
+ namespace: default
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
- name: haproxy-ingress-cluster-role
+ name: haproxy-kubernetes-ingress
 rules:
  - apiGroups:
      - ""
@@ -87,13 +87,13 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: haproxy-ingress-cluster-role-binding
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: haproxy-ingress-cluster-role
+  name: haproxy-kubernetes-ingress
 subjects:
 - kind: ServiceAccount
-  name: haproxy-ingress-service-account
-  namespace: haproxy-controller
+  name: haproxy-kubernetes-ingress
+  namespace: default

deploy/tests/config/3.configmap.yaml

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

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

@@ -3,8 +3,8 @@ kind: Deployment
 metadata:
  labels:
    run: haproxy-ingress
- name: haproxy-ingress
- namespace: haproxy-controller
+ name: haproxy-kubernetes-ingress
+ namespace: default
 spec:
  replicas: 1
  selector:
@@ -15,7 +15,7 @@ spec:
      labels:
        run: haproxy-ingress
    spec:
-     serviceAccountName: haproxy-ingress-service-account
+     serviceAccountName: haproxy-kubernetes-ingress
      containers:
      - name: haproxy-ingress
        image: haproxytech/kubernetes-ingress:latest
@@ -26,9 +26,9 @@ spec:
          requests:
            memory: 256Mi
        args:
-       - --default-backend-service=$(POD_NAMESPACE)/default-backend
-       - --configmap=$(POD_NAMESPACE)/haproxy-configmap
-       - --configmap-tcp-services=$(POD_NAMESPACE)/haproxy-configmap-tcp
+       - --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
        - --configmap-patternfiles=$(POD_NAMESPACE)/patternfiles
        - --ingress.class=haproxy
@@ -73,14 +73,14 @@ spec:
 ---
 apiVersion: v1
 kind: Service
-metadata:  
-  name: haproxy-ingress
-  namespace: haproxy-controller
+metadata:
+  name: haproxy-kubernetes-ingress
+  namespace: default
 spec:
-  selector:    
+  selector:
     run: haproxy-ingress
   type: NodePort
-  ports:  
+  ports:
   - name: http
     port: 80
     targetPort: 80