Skip to content

Fix workspaces ingress hostname

Vishal Takrequested to merge
vtak/fix_workspaces_ingress into master

What does this MR do?

In Add workspaces external URL config (!4473 - merged) , the workspaces ingress was added as part of KAS helm chart. However, the ingress is suppose to be for the wildcard domain of the value in the app config. This MR fixes that.

Related issues

Local test

I ran the following command to verify the changes locally

helm template gitlab . \
  --namespace gitlab-vtak \
  --create-namespace \
  --set global.hosts.domain="gitlab.vtak.remote-development-test.com" \
  --set certmanager-issuer.email=vtak@gitlab.com \
  --set global.hosts.kas.name="kas.vtak.remote-development-test.com" \
  --set global.workspaces.enabled="true" \
  --set global.hosts.workspaces.name="workspaces.vtak.remote-development-test.com"

Before

# Source: gitlab/charts/gitlab/charts/kas/templates/ingress-workspaces.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
  name: gitlab-kas-workspaces
  namespace: gitlab-vtak
  labels:
    app: kas
    chart: kas-9.4.0
    release: gitlab
    heritage: Helm
    
  annotations:
    kubernetes.io/ingress.class: "gitlab-nginx"
    kubernetes.io/ingress.provider: "nginx"
    nginx.ingress.kubernetes.io/proxy-buffering: "off"
    nginx.ingress.kubernetes.io/custom-http-errors: ""
    cert-manager.io/issuer: "gitlab-issuer"
    acme.cert-manager.io/http01-edit-in-place: "true"
spec:
  
  rules:
    - host: "workspaces.vtak.remote-development-test.com"
      http:
        paths:
          - path: "/"
            pathType: Prefix
            backend:
              service:
                name: gitlab-kas
                port:
                  number: 8160
  tls:
    - hosts:
      - workspaces.vtak.remote-development-test.com
      secretName: gitlab-kas-workspaces-tls

After

# Source: gitlab/charts/gitlab/charts/kas/templates/ingress-workspaces.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
  name: gitlab-kas-workspaces
  namespace: gitlab-vtak
  labels:
    app: kas
    chart: kas-9.4.0
    release: gitlab
    heritage: Helm
    
  annotations:
    kubernetes.io/ingress.class: "gitlab-nginx"
    kubernetes.io/ingress.provider: "nginx"
    nginx.ingress.kubernetes.io/proxy-buffering: "off"
    nginx.ingress.kubernetes.io/custom-http-errors: ""
    cert-manager.io/issuer: "gitlab-issuer"
    acme.cert-manager.io/http01-edit-in-place: "true"
spec:
  
  rules:
    - host: "*.workspaces.vtak.remote-development-test.com"
      http:
        paths:
          - path: "/"
            pathType: Prefix
            backend:
              service:
                name: gitlab-kas
                port:
                  number: 8160
  tls:
    - hosts:
      - "*.workspaces.vtak.remote-development-test.com"
      secretName: gitlab-kas-workspaces-tls

Author checklist

For general guidance, please follow our Contributing guide.

Required

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

  • Merge Request Title and Description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • MR has a green pipeline.
  • Documentation created/updated. - We are working on releasing this feature out. This is a WIP.
  • Tests added/updated, and test plan for scenarios not covered by automated tests. - No tests needed for this change.
  • Equivalent MR/issue for omnibus-gitlab opened. - Omnibus changes are yet to be done. This is a WIP. This is being tracked in Add option in GitLab Helm Chart to configure do... (#6099 - closed)

Reviewers checklist

Edited by João Alexandre Cunha

Merge request reports