diff --git a/bitnami/harbor/Chart.yaml b/bitnami/harbor/Chart.yaml index f9a449b67..6e8005b56 100644 --- a/bitnami/harbor/Chart.yaml +++ b/bitnami/harbor/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: harbor -version: 2.0.0 +version: 2.0.1 appVersion: 1.8.1 description: Harbor is an an open source trusted cloud native registry project that stores, signs, and scans content keywords: diff --git a/bitnami/harbor/templates/ingress/ingress.yaml b/bitnami/harbor/templates/ingress/ingress.yaml index 6337e3b84..bb05c2147 100644 --- a/bitnami/harbor/templates/ingress/ingress.yaml +++ b/bitnami/harbor/templates/ingress/ingress.yaml @@ -1,14 +1,14 @@ {{- if eq .Values.service.type "Ingress" }} {{- $ingress := .Values.service.ingress -}} {{- $tls := .Values.service.tls -}} -{{- if eq .Values.expose.ingress.controller "gce" }} +{{- if eq .Values.service.ingress.controller "gce" }} {{- $_ := set . "portal_path" "/*" -}} {{- $_ := set . "api_path" "/api/*" -}} {{- $_ := set . "service_path" "/service/*" -}} {{- $_ := set . "v2_path" "/v2/*" -}} {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} {{- $_ := set . "controller_path" "/c/*" -}} -{{- else if eq .Values.expose.ingress.controller "ncp" }} +{{- else if eq .Values.service.ingress.controller "ncp" }} {{- $_ := set . "portal_path" "/" -}} {{- $_ := set . "api_path" "/api/.*" -}} {{- $_ := set . "service_path" "/service/.*" -}} @@ -56,7 +56,7 @@ spec: {{- end }} {{- end }} {{- end }} - {{- if eq .Values.expose.ingress.controller "ncp" }} + {{- if eq .Values.service.ingress.controller "ncp" }} backend: serviceName: "{{ template "harbor.portal" . }}" servicePort: http