From e48fd734848d665ff8935e004ca6ea95377fc1da Mon Sep 17 00:00:00 2001 From: yminer Date: Mon, 4 Nov 2024 05:18:07 +0000 Subject: [PATCH 1/3] remove chart repo path from ingress template Signed-off-by: yminer --- templates/ingress/ingress.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/templates/ingress/ingress.yaml b/templates/ingress/ingress.yaml index f2314716e..06096b86f 100644 --- a/templates/ingress/ingress.yaml +++ b/templates/ingress/ingress.yaml @@ -7,7 +7,6 @@ {{- $_ := 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" }} {{- $_ := set . "path_type" "Prefix" -}} @@ -15,7 +14,6 @@ {{- $_ := set . "api_path" "/api/.*" -}} {{- $_ := set . "service_path" "/service/.*" -}} {{- $_ := set . "v2_path" "/v2/.*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} {{- $_ := set . "controller_path" "/c/.*" -}} {{- else }} {{- $_ := set . "path_type" "Prefix" -}} @@ -23,7 +21,6 @@ {{- $_ := set . "api_path" "/api/" -}} {{- $_ := set . "service_path" "/service/" -}} {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} {{- $_ := set . "controller_path" "/c/" -}} {{- end }} @@ -83,10 +80,6 @@ spec: backend: serviceName: {{ template "harbor.core" . }} servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - path: {{ .controller_path }} backend: serviceName: {{ template "harbor.core" . }} @@ -117,13 +110,6 @@ spec: name: {{ template "harbor.core" . }} port: number: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - pathType: {{ .path_type }} - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - path: {{ .controller_path }} pathType: {{ .path_type }} backend: From 5715130289d21d4ccdd18859422745cf81cfbac6 Mon Sep 17 00:00:00 2001 From: Pramod Valavala Date: Wed, 20 Nov 2024 06:25:23 -0500 Subject: [PATCH 2/3] Add entry for `ingress.className` in README (#1832) Signed-off-by: Pramod Valavala --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ec394b84a..39b880c07 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ The following table lists the configurable parameters of the Harbor chart and th | `expose.ingress.hosts.core` | The host of Harbor core service in ingress rule | `core.harbor.domain` | | `expose.ingress.controller` | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp` | `default` | | `expose.ingress.kubeVersionOverride` | Allows the ability to override the kubernetes version used while templating the ingress | | +| `expose.ingress.className` | Specify the `ingressClassName` used to implement the Ingress (Kubernetes 1.18+) | | | `expose.ingress.annotations` | The annotations used commonly for ingresses | | | `expose.ingress.labels` | The labels specific to ingress | {} | | `expose.clusterIP.name` | The name of ClusterIP service | `harbor` | From cccbc3f3c287e06c62271245dc7ae03c8f46753b Mon Sep 17 00:00:00 2001 From: miner Date: Thu, 21 Nov 2024 00:21:00 +0800 Subject: [PATCH 3/3] add comment for CSRF key setting (#1868) Signed-off-by: yminer Co-authored-by: yminer --- values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/values.yaml b/values.yaml index c862337d0..98206b0f4 100644 --- a/values.yaml +++ b/values.yaml @@ -625,6 +625,8 @@ core: # If tokenKey is set, the value of tokenCert must be set as a PEM-encoded certificate signed by tokenKey, and supplied as a multiline string, indented one more than tokenCert on the following line. tokenCert: | # The XSRF key. Will be generated automatically if it isn't specified + # While you specified, Please make sure it is 32 characters, otherwise would have validation issue at the harbor-core runtime + # https://github.com/goharbor/harbor/pull/21154 xsrfKey: "" # If using existingSecret, the key is defined by core.existingXsrfSecretKey existingXsrfSecret: ""