mirror of
https://github.com/goharbor/harbor.git
synced 2024-11-12 21:44:37 +01:00
Merge pull request #4769 from draeron/helm/fix-volume
[Chart] Fix registry storage config issue
This commit is contained in:
commit
eedbc830ac
@ -8,17 +8,18 @@ data:
|
||||
config.yml: |+
|
||||
version: 0.1
|
||||
log:
|
||||
level: info
|
||||
level: {{ .Values.registry.logLevel }}
|
||||
fields:
|
||||
service: registry
|
||||
storage:
|
||||
{{- if .Values.registry.objectStorage }}
|
||||
{{ toYaml .Values.registry.objectStorage | indent 6 }}
|
||||
{{- else }}
|
||||
filesystem:
|
||||
rootdirectory: /var/lib/registry
|
||||
{{- end }}
|
||||
cache:
|
||||
layerinfo: inmemory
|
||||
filesystem:
|
||||
rootdirectory: /var/lib/registry
|
||||
maintenance:
|
||||
uploadpurging:
|
||||
enabled: false
|
||||
|
@ -35,8 +35,10 @@ spec:
|
||||
- containerPort: 5000
|
||||
- containerPort: 5001
|
||||
volumeMounts:
|
||||
{{- if not .Values.registry.objectStorage }}
|
||||
- name: registry-data
|
||||
mountPath: /var/lib/registry
|
||||
{{- end }}
|
||||
- name: registry-root-certificate
|
||||
mountPath: /etc/registry/root.crt
|
||||
subPath: root.crt
|
||||
@ -44,20 +46,13 @@ spec:
|
||||
mountPath: /etc/registry/config.yml
|
||||
subPath: config.yml
|
||||
volumes:
|
||||
{{- if not .Values.registry.objectStorage }}
|
||||
{{- if not .Values.persistence.enabled }}
|
||||
- name: registry-data
|
||||
emptyDir: {}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
- name: registry-root-certificate
|
||||
secret:
|
||||
secretName: "{{ template "harbor.fullname" . }}-registry"
|
||||
- name: registry-config
|
||||
configMap:
|
||||
name: "{{ template "harbor.fullname" . }}-registry"
|
||||
{{- if not .Values.registry.objectStorage }}
|
||||
{{- if .Values.persistence.enabled }}
|
||||
{{- if and (not .Values.registry.objectStorage) .Values.persistence.enabled }}
|
||||
volumeClaimTemplates:
|
||||
- metadata:
|
||||
name: "registry-data"
|
||||
@ -76,4 +71,3 @@ spec:
|
||||
requests:
|
||||
storage: {{ .Values.registry.volumes.data.size | quote }}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
@ -198,7 +198,7 @@ registry:
|
||||
tag: v2.6.2-v1.4.0
|
||||
pullPolicy: IfNotPresent
|
||||
httpSecret: not-a-secure-secret
|
||||
logLevel:
|
||||
logLevel: info
|
||||
# comment out one of the below to use your cloud's object storage.
|
||||
# objectStorage:
|
||||
# gcs:
|
||||
|
Loading…
Reference in New Issue
Block a user