fix: allow scope/tcp/udp configmap namespace to be configured

[toredash]

What this PR does / why we need it:

Re-introduces the ability to override .Values.controller.tcp.configMapNamespace, .Values.controller.udp.configMapNamespace and .Values.controller.configMapNamespace. Seems to have been partly removed in 9f3fbc3

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

fixes #7159

How Has This Been Tested?

% git diff
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 944d00ab7..82ef36cb7 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -108,24 +108,24 @@ controller:
   ## Limit the scope of the controller
   ##
   scope:
-    enabled: false
-    namespace: ""   # defaults to $(POD_NAMESPACE)
+    enabled: true
+    namespace: "scopeNamespace"   # defaults to $(POD_NAMESPACE)
 
   ## Allows customization of the configmap / nginx-configmap namespace
   ##
-  configMapNamespace: ""   # defaults to $(POD_NAMESPACE)
+  configMapNamespace: "configNamespace"   # defaults to $(POD_NAMESPACE)
 
   ## Allows customization of the tcp-services-configmap
   ##
   tcp:
-    configMapNamespace: ""   # defaults to $(POD_NAMESPACE)
+    configMapNamespace: "tcpNamespace"   # defaults to $(POD_NAMESPACE)
     ## Annotations to be added to the tcp config configmap
     annotations: {}
 
   ## Allows customization of the udp-services-configmap
   ##
   udp:
-    configMapNamespace: ""   # defaults to $(POD_NAMESPACE)
+    configMapNamespace: "udpNamespace"   # defaults to $(POD_NAMESPACE)
     ## Annotations to be added to the udp config configmap
     annotations: {}
 
@@ -778,14 +778,14 @@ imagePullSecrets: []
 # TCP service key:value pairs
 # Ref: https://github.com/kubernetes/contrib/tree/master/ingress/controllers/nginx/examples/tcp
 ##
-tcp: {}
-#  8080: "default/example-tcp-svc:9000"
+tcp:
+  8080: "default/example-tcp-svc:9000"
 
 # UDP service key:value pairs
 # Ref: https://github.com/kubernetes/contrib/tree/master/ingress/controllers/nginx/examples/udp
 ##
-udp: {}
-#  53: "kube-system/kube-dns:53"
+udp:
+  53: "kube-system/kube-dns:53"
 
 # A base64ed Diffie-Hellman parameter
 # This can be generated with: openssl dhparam 4096 2> /dev/null | base64
% git     
% helm template namespace charts/ingress-nginx | grep -e Namespace
      - "scopeNamespace"
            - --configmap=configNamespace/namespace-ingress-nginx-controller
            - --tcp-services-configmap=tcpNamespace/namespace-ingress-nginx-tcp
            - --udp-services-configmap=udpNamespace/namespace-ingress-nginx-udp
            - --watch-namespace=scopeNamespace

Checklist:

• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I've read the CONTRIBUTION guide
• I have added tests to cover my changes.
• All new and existing tests passed.

[k8s-ci-robot]

Hi @toredash. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[toredash]

/assign @ChiefAlexander

[kfox1111]

lgtm

[kfox1111]

Any updates?

[rikatz]

/area helm

[kfox1111]

Anything I can do to help this along? Still getting bit by this.

[tao12345666333]

please rebase.

[toredash]

please rebase.

done

[tao12345666333]

/assign

[tao12345666333]

/ok-to-test

[cpanato]

/retest

[cpanato]

/lgtm

[cpanato]

/assign @rikatz

[rikatz]

/approve
Thanks!

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, rikatz, toredash

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• charts/ingress-nginx/OWNERS [rikatz]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment