Skip to content

Allow change of the ingress provider and annotations

What does this MR do?

Give the option to change the default ingress provider and annotations. The default annotations should also not be passed when a different provider is set.

Testing

To test, the default provider is global.ingress.provider: nginx, all the ingress resources should have the default annotations and provider set to nginx

    kubernetes.io/ingress.provider: nginx
    nginx.ingress.kubernetes.io/proxy-body-size: "0"
    nginx.ingress.kubernetes.io/proxy-read-timeout: "900"
    nginx.ingress.kubernetes.io/proxy-request-buffering: "off"
    nginx.ingress.kubernetes.io/proxy-buffering: "off"

Setting to global.ingress.provider: haproxy the default nginx annotations are not added. You can add your annotations in the values.yaml file and the same should be passed to the ingress resources

ingress:
  provider: haproxy
  annotations: 
      haproxy.org/auth-type: basic-auth
      haproxy.org/auth-secret: default/haproxy-credentials
      haproxy.org/check: "true"
      haproxy.org/check-http: "/health"

Related issues

Closes #907 (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

Closes #907 (closed)

Edited by Silvester Wainaina

Merge request reports