Fix misc issues of Harbor chart

1. Read value of storage driver from values.yaml for adminserver
2. Set Redis as UI cache
3. Set Redis as registry cache
This commit is contained in:
Wenkai Yin 2018-07-27 13:24:22 +08:00
parent c3106fc447
commit 5772a61e5d
4 changed files with 7 additions and 10 deletions

View File

@ -55,4 +55,4 @@ data:
UAA_CLIENTID: ""
UAA_CLIENTSECRET: ""
UAA_VERIFY_CERT: "True"
REGISTRY_STORAGE_PROVIDER_NAME: "filesystem"
REGISTRY_STORAGE_PROVIDER_NAME: "{{ .Values.registry.storage.type }}"

View File

@ -130,16 +130,16 @@ data:
{{- end }}
{{- end }}
cache:
layerinfo: inmemory
layerinfo: redis
maintenance:
uploadpurging:
enabled: false
delete:
enabled: true
{{- if .Values.registry.redis }}
redis:
{{ toYaml .Values.registry.redis | indent 6 }}
{{- end }}
addr: "{{ template "harbor.redis.host" . }}:{{ template "harbor.redis.port" . }}"
password: {{ template "harbor.redis.password" . }}
db: {{ template "harbor.redis.databaseIndex" . }}
http:
addr: :5000
# set via environment variable
@ -152,7 +152,6 @@ data:
realm: "{{ template "harbor.externalURL" . }}/service/token"
rootcertbundle: /etc/registry/root.crt
service: harbor-registry
notifications:
endpoints:
- name: harbor

View File

@ -28,6 +28,8 @@ spec:
secretKeyRef:
name: "{{ template "harbor.fullname" . }}-ui"
key: jobserviceSecret
- name: _REDIS_URL
value: {{ template "harbor.redisForUI" . }}
- name: GODEBUG
value: netdns=cgo
- name: LOG_LEVEL

View File

@ -291,10 +291,6 @@ registry:
# requests:
# memory: 256Mi
# cpu: 100m
## Enable the redis caching in the registry
#redis:
# addr: "redis-host:6379"
# db: 2
nodeSelector: {}
tolerations: []
affinity: {}