diff --git a/templates/ingress/ingresshost.yaml b/templates/ingress/ingresshost.yaml index 5cae3983032b678dae27941983ab404cc0bad9dd..606f67eaa0162969eb37e746c2d1b897eb4cc146 100644 --- a/templates/ingress/ingresshost.yaml +++ b/templates/ingress/ingresshost.yaml @@ -11,6 +11,6 @@ metadata: labels: {{ include "harbor.labels" . | nindent 4 }} spec: - host: "{{ $.Values.global.host }}" + host: "{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}" {{- end -}} diff --git a/templates/ingress/ingressroute.yaml b/templates/ingress/ingressroute.yaml index d689ace518a70503251f3fda6a764edfbd8327b4..899be9d93ec63ceea9c505bb9b7bce7553f8f86a 100644 --- a/templates/ingress/ingressroute.yaml +++ b/templates/ingress/ingressroute.yaml @@ -14,34 +14,34 @@ spec: entryPoints: - websecure routes: - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/`) kind: Rule services: - name: {{ template "harbor.portal" . }} port: {{ template "harbor.portal.servicePort" . }} - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/api/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/api/`) kind: Rule services: - name: {{ template "harbor.core" . }} port: {{ template "harbor.core.servicePort" . }} - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/service/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/service/`) kind: Rule services: - name: {{ template "harbor.core" . }} port: {{ template "harbor.core.servicePort" . }} - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/v2/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/v2/`) kind: Rule middlewares: - name: "{{ template "harbor.ingress" . }}-https" services: - name: {{ template "harbor.core" . }} port: {{ template "harbor.core.servicePort" . }} - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/chartrepo/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/chartrepo/`) kind: Rule services: - name: {{ template "harbor.core" . }} port: {{ template "harbor.core.servicePort" . }} - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/c/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/c/`) kind: Rule services: - name: {{ template "harbor.core" . }} @@ -62,32 +62,32 @@ spec: entryPoints: - web routes: - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/`) kind: Rule services: - name: {{ template "harbor.portal" . }} port: {{ template "harbor.portal.servicePort" . }} - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/api/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/api/`) kind: Rule services: - name: {{ template "harbor.core" . }} port: {{ template "harbor.core.servicePort" . }} - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/service/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/service/`) kind: Rule services: - name: {{ template "harbor.core" . }} port: {{ template "harbor.core.servicePort" . }} - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/v2/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/v2/`) kind: Rule services: - name: {{ template "harbor.core" . }} port: {{ template "harbor.core.servicePort" . }} - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/chartrepo/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/chartrepo/`) kind: Rule services: - name: {{ template "harbor.core" . }} port: {{ template "harbor.core.servicePort" . }} - - match: Host(`{{ $.Values.global.host }}`) && PathPrefix(`/c/`) + - match: Host(`{{ $.Values.expose.ingress.hosts.core }}.{{ $.Values.global.host }}`) && PathPrefix(`/c/`) kind: Rule services: - name: {{ template "harbor.core" . }}