From 10d3d48a6ccfac7109752cfc77cf9b44f65ccc73 Mon Sep 17 00:00:00 2001
From: Fernando Diaz <diazjf@us.ibm.com>
Date: Thu, 11 Oct 2018 20:47:00 -0500
Subject: [PATCH] Remove TCP/UDP ConfigMaps from Dev

Removes unneeded ConfigMaps from the Development Environment which
are causing ingress-nginx pods to crash

Fixes #3223
---
 deploy/mandatory.yaml              | 24 ------------------------
 deploy/tcp-services-configmap.yaml | 11 -----------
 deploy/udp-services-configmap.yaml | 11 -----------
 deploy/with-rbac.yaml              |  2 --
 4 files changed, 48 deletions(-)
 delete mode 100644 deploy/tcp-services-configmap.yaml
 delete mode 100644 deploy/udp-services-configmap.yaml

diff --git a/deploy/mandatory.yaml b/deploy/mandatory.yaml
index 27d3d67a7..f8511d2cd 100644
--- a/deploy/mandatory.yaml
+++ b/deploy/mandatory.yaml
@@ -16,28 +16,6 @@ metadata:
 
 ---
 
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tcp-services
-  namespace: ingress-nginx
-  labels:
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-
----
-
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: udp-services
-  namespace: ingress-nginx
-  labels:
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-
----
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -215,8 +193,6 @@ spec:
           args:
             - /nginx-ingress-controller
             - --configmap=$(POD_NAMESPACE)/nginx-configuration
-            - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
-            - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
             - --publish-service=$(POD_NAMESPACE)/ingress-nginx
             - --annotations-prefix=nginx.ingress.kubernetes.io
           securityContext:
diff --git a/deploy/tcp-services-configmap.yaml b/deploy/tcp-services-configmap.yaml
deleted file mode 100644
index 464fba1cd..000000000
--- a/deploy/tcp-services-configmap.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tcp-services
-  namespace: ingress-nginx
-  labels:
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-
----
-
diff --git a/deploy/udp-services-configmap.yaml b/deploy/udp-services-configmap.yaml
deleted file mode 100644
index 3337910b0..000000000
--- a/deploy/udp-services-configmap.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: udp-services
-  namespace: ingress-nginx
-  labels:
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-
----
-
diff --git a/deploy/with-rbac.yaml b/deploy/with-rbac.yaml
index 636f178bc..a9fda7710 100644
--- a/deploy/with-rbac.yaml
+++ b/deploy/with-rbac.yaml
@@ -28,8 +28,6 @@ spec:
           args:
             - /nginx-ingress-controller
             - --configmap=$(POD_NAMESPACE)/nginx-configuration
-            - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
-            - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
             - --publish-service=$(POD_NAMESPACE)/ingress-nginx
             - --annotations-prefix=nginx.ingress.kubernetes.io
           securityContext: