Use correct template for TCP configmap

This aligns the template used when naming the TCP configmap with what is
defined in the Deployment. This was a miss from our NGINX chart upgrade.

charts/nginx-ingress/templates/controller-daemonset.yaml

@@ -85,7 +85,7 @@ spec:
             - --ingress-class={{ template "ingress-nginx.controller.ingress-class" . }}
             - --configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.controller.fullname" . }}
           {{- if or .Values.tcp (include "gitlab.shell.port" $ ) }}
-            - --tcp-services-configmap={{ .Release.Namespace }}/{{ template "ingress-nginx.fullname" . }}-tcp
+            - --tcp-services-configmap={{ .Release.Namespace }}/{{ template "ingress-nginx.tcp-configmap" . }}
           {{- end }}
           {{- if .Values.udp }}
             - --udp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-udp

templates/_helpers.tpl

@@ -280,7 +280,7 @@ Returns the nginx ingress class
 Overrides the ingress-nginx template to make sure gitlab-shell name matches
 */}}
 {{- define "ingress-nginx.tcp-configmap" -}}
-{{ .Release.Name}}-ingress-nginx-tcp
+{{ .Release.Name}}-nginx-ingress-tcp
 {{- end -}}
 
 {{/*