[harbor] Add upstream "ipFamily" parameters (#7292)

* Add upstream "ipFamily" parameters

Signed-off-by: David Young <davidy@funkypenguin.co.nz>

* Add params for readme generation

Signed-off-by: David Young <davidy@funkypenguin.co.nz>

* Trim trailing spaces

Signed-off-by: David Young <davidy@funkypenguin.co.nz>

* Bump chart version to keep up!

Signed-off-by: David Young <davidy@funkypenguin.co.nz>

* Remove blank line (ct is fussy!)

Signed-off-by: David Young <davidy@funkypenguin.co.nz>

* Add newline

Signed-off-by: David Young <davidy@funkypenguin.co.nz>
This commit is contained in:
David Young
2021-08-24 17:30:19 +02:00
committed by GitHub
parent 6c2a03115d
commit 8cc149aee5
6 changed files with 44 additions and 1 deletions
+1 -1
View File
@@ -34,4 +34,4 @@ sources:
- https://github.com/bitnami/bitnami-docker-harbor-registry
- https://github.com/bitnami/bitnami-docker-harbor-registryctl
- https://goharbor.io/
version: 10.2.8
version: 10.2.9
+6
View File
@@ -124,6 +124,12 @@ Additionally, if `persistence.resourcePolicy` is set to `keep`, you should manua
| `ingress.controller` | The ingress controller type. Currently supports `default`, `gce` and `ncp` | `default` |
| `ingress.annotations` | Ingress annotations done as key:value pairs | `{}` |
### IP family parameters
| Name | Description | Value |
| ------------------------- | ----------------------------------------------- | ----- |
| `ipFamily.ipv6.enabled` | Enable listening on IPv6 (`[::]`) for nginx-based components (nginx,portal) - Note that enabling ipv6 will cause nginx to crash on start on systems with IPv6 disabled using the `ipv6.disable` kernel flag | `true`
| `ipFamily.ipv4.enabled` | If ipv4 is enabled in cluster, all ipv4 related configs will set correspondly, but currently it only affects the nginx related components | `true`
### Persistence Parameters
@@ -50,8 +50,12 @@ data:
access_log /dev/stdout timed_combined;
server {
{{- if .Values.ipFamily.ipv4.enabled}}
listen 8080;
{{- end}}
{{- if .Values.ipFamily.ipv6.enabled }}
listen [::]:8080;
{{- end }}
server_tokens off;
# disable any limits to avoid HTTP 413 for large image uploads
client_max_body_size 0;
@@ -58,8 +58,12 @@ data:
{{- if .Values.notary.enabled }}
server {
{{- if .Values.ipFamily.ipv4.enabled }}
listen 4443 ssl;
{{- end}}
{{- if .Values.ipFamily.ipv6.enabled}}
listen [::]:4443 ssl;
{{- end }}
server_tokens off;
# ssl
ssl_certificate /etc/nginx/cert/tls.crt;
@@ -94,8 +98,12 @@ data:
{{- end }}
server {
{{- if .Values.ipFamily.ipv4.enabled }}
listen 8443 ssl;
{{- end}}
{{- if .Values.ipFamily.ipv6.enabled }}
listen [::]:8443 ssl;
{{- end }}
server_tokens off;
# SSL
ssl_certificate /etc/nginx/cert/tls.crt;
@@ -226,8 +234,12 @@ data:
}
}
server {
{{- if .Values.ipFamily.ipv4.enabled }}
listen 8080;
{{- end}}
{{- if .Values.ipFamily.ipv6.enabled }}
listen [::]:8080;
{{- end}}
return 301 https://$host$request_uri;
}
}
@@ -25,8 +25,12 @@ data:
scgi_temp_path /tmp/scgi_temp;
server {
{{- if .Values.internalTLS.enabled }}
{{- if .Values.ipFamily.ipv4.enabled}}
listen {{ template "harbor.portal.containerPort" . }} ssl;
{{- end }}
{{- if .Values.ipFamily.ipv6.enabled}}
listen [::]:{{ template "harbor.portal.containerPort" . }} ssl;
{{- end }}
# SSL
ssl_certificate /etc/harbor/ssl/portal/tls.crt;
ssl_certificate_key /etc/harbor/ssl/portal/tls.key;
@@ -37,9 +41,13 @@ data:
ssl_prefer_server_ciphers on;
ssl_session_cache shared:SSL:10m;
{{- else }}
{{- if .Values.ipFamily.ipv4.enabled }}
listen {{ template "harbor.portal.containerPort" . }};
{{- end }}
{{- if .Values.ipFamily.ipv6.enabled}}
listen [::]:{{ template "harbor.portal.containerPort" . }};
{{- end }}
{{- end }}
server_name localhost;
root /opt/bitnami/harbor;
index index.html index.htm;
+13
View File
@@ -88,6 +88,19 @@ volumePermissions:
##
internalTLS:
enabled: false
ipFamily:
## Enable listening on IPv6 ([::]) for nginx-based components (nginx,portal)
## Note that enabling ipv6 will cause nginx to crash on start on systems
## with IPv6 disabled using the `ipv6.disable` kernel flag)
## @param ipFamily.ipv6.enabled Enable listening on IPv6 ([::]) for nginx-based components (nginx,portal)
ipv6:
enabled: true
## ipv4Enabled set to true if ipv4 is enabled in cluster
## @param ipFamily.ipv4.enabled Enable listening on IPv4 for nginx-based components (nginx,portal)
ipv4:
enabled: true
## @param caBundleSecretName The custom ca bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for chartmuseum, clair, core, jobservice, registry, trivy components.
##
caBundleSecretName: ""