Skip to content

Resolve "ingress-nginx DaemonSet does not bind SSH port"

Mitchell Nielsen requested to merge 2511-fix-nginx-daemonset-tcp-configmap into master

What does this MR do?

  • Updates the NGINX DaemonSet to use the appropriate template for the TCP configmap name
  • Updates the TCP configmap name template to use nginx-ingress instead of ingress-nginx

Related issues

#2511 (closed)

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • Merge Request Title and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened

Testing

$ cat test.values.yaml
nginx-ingress:
  controller:
    kind: DaemonSet

Confirm that the TCP configmap created by GitLab Shell and the TCP configmap name used by the DaemonSet NGINX controller match:

$ helm template --set certmanager-issuer.email=no@no.com gitlab . -f test.values.yaml | grep gitlab-nginx-ingress-tcp
  name: gitlab-nginx-ingress-tcp
            - --tcp-services-configmap=default/gitlab-nginx-ingress-tcp

Closes #2511 (closed)

Edited by Mitchell Nielsen

Merge request reports