Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-04-02 15:27:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/harbor] Configure alternate domains for Notary Signer self-signed certificates (#5596)

Browse Source
This commit is contained in:
Juan Ariza Toledano
2021-02-25 15:58:50 +01:00
committed by GitHub
parent 4ac2aa52e5
commit 3e2d5b4c1d
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/harbor/Chart.yaml
View File

@@ -34,4 +34,4 @@ sources:
- https://github.com/bitnami/bitnami-docker-harbor-registry - https://github.com/bitnami/bitnami-docker-harbor-registry
- https://github.com/bitnami/bitnami-docker-harbor-registryctl - https://github.com/bitnami/bitnami-docker-harbor-registryctl
- https://goharbor.io/ - https://goharbor.io/
version: 9.6.0 version: 9.6.1

13
bitnami/harbor/templates/ingress/ingress.yaml
View File

@@ -53,19 +53,6 @@ spec:
hosts: hosts:
- {{ .Values.ingress.hosts.core }} - {{ .Values.ingress.hosts.core }}
{{- end }} {{- end }}
{{- if .Values.notary.enabled }}
{{- if .Values.service.tls.notaryExistingSecret }}
- secretName: {{ .Values.service.tls.notaryExistingSecret | quote }}
{{- else if .Values.service.tls.existingSecret }}
- secretName: {{ .Values.service.tls.existingSecret | quote }}
{{- else }}
- secretName: {{ include "harbor.ingress" . | quote }}
{{- end }}
{{- if .Values.ingress.hosts.notary }}
hosts:
- {{ .Values.ingress.hosts.notary }}
{{- end }}
{{- end }}
{{- end }} {{- end }}
{{- if eq .Values.ingress.controller "ncp" }} {{- if eq .Values.ingress.controller "ncp" }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "harbor.portal" .) "servicePort" "http" "context" $) | nindent 4 }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "harbor.portal" .) "servicePort" "http" "context" $) | nindent 4 }}

5
bitnami/harbor/templates/notary/notary-secret.yaml
View File

@@ -14,8 +14,9 @@ metadata:
type: Opaque type: Opaque
data: data:
{{- if not .Values.notary.secretName }} {{- if not .Values.notary.secretName }}
{{ $ca := genCA "harbor-notary-ca" 365 }} {{- $ca := genCA "harbor-notary-ca" 365 }}
{{ $cert := genSignedCert (include "harbor.notary-signer" .) nil nil 365 $ca }} {{- $altNames := list (printf "%s.%s.svc" (include "harbor.notary-signer" .) .Release.Namespace) (printf "%s.%s" (include "harbor.notary-signer" .) .Release.Namespace) (include "harbor.notary-signer" .) -}}
{{- $cert := genSignedCert (include "harbor.notary-signer" .) nil $altNames 365 $ca }}
notary-signer-ca.crt: {{ $ca.Cert | b64enc | quote }} notary-signer-ca.crt: {{ $ca.Cert | b64enc | quote }}
notary-signer.crt: {{ $cert.Cert | b64enc | quote }} notary-signer.crt: {{ $cert.Cert | b64enc | quote }}
notary-signer.key: {{ $cert.Key | b64enc | quote }} notary-signer.key: {{ $cert.Key | b64enc | quote }}