Skip to content

Commit

Permalink
Merge pull request #12 from kubesphere/upgrade/harbor
Browse files Browse the repository at this point in the history
Sync with Harbor Helm 1.1.1
  • Loading branch information
hlwanghl authored Aug 8, 2019
2 parents b220e87 + 88541ff commit 01a198e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/qingcloud/harbor/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: harbor
version: 1.1.0
appVersion: 1.8.0
version: 1.1.1
appVersion: 1.8.1
description: An open source trusted cloud native registry that stores, signs, and scans content
keywords:
- docker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ data:
ALLOW_OVERWRITE: "true"
#CHART_URL: {{ .Values.externalURL }}/chartrepo
AUTH_ANONYMOUS_GET: "false"
TLS_CERT:
TLS_KEY:
TLS_CERT: ""
TLS_KEY: ""
CONTEXT_PATH:
INDEX_LIMIT: "0"
MAX_STORAGE_OBJECTS: "0"
Expand Down Expand Up @@ -96,4 +96,4 @@ data:
{{- end }}
ALIBABA_CLOUD_ACCESS_KEY_ID: {{ $storage.oss.accesskeyid }}
{{- end }}
{{- end }}
{{- end }}
24 changes: 12 additions & 12 deletions src/qingcloud/harbor/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ secretKey: "not-a-secure-key"
nginx:
image:
repository: goharbor/nginx-photon
tag: v1.8.0
tag: v1.8.1
replicas: 1
# resources:
# requests:
Expand All @@ -249,7 +249,7 @@ nginx:
portal:
image:
repository: goharbor/harbor-portal
tag: v1.8.0
tag: v1.8.1
replicas: 1
# resources:
# requests:
Expand All @@ -264,7 +264,7 @@ portal:
core:
image:
repository: goharbor/harbor-core
tag: v1.8.0
tag: v1.8.1
replicas: 1
# resources:
# requests:
Expand All @@ -290,7 +290,7 @@ core:
jobservice:
image:
repository: goharbor/harbor-jobservice
tag: v1.8.0
tag: v1.8.1
replicas: 1
maxJobWorkers: 10
# The logger for jobs: "file", "database" or "stdout"
Expand All @@ -313,15 +313,15 @@ registry:
registry:
image:
repository: goharbor/registry-photon
tag: v2.7.1-patch-2819-v1.8.0
tag: v2.7.1-patch-2819-v1.8.1
# resources:
# requests:
# memory: 256Mi
# cpu: 100m
controller:
image:
repository: goharbor/harbor-registryctl
tag: v1.8.0
tag: v1.8.1
# resources:
# requests:
# memory: 256Mi
Expand All @@ -343,7 +343,7 @@ chartmuseum:
enabled: true
image:
repository: goharbor/chartmuseum-photon
tag: v0.8.1-v1.8.0
tag: v0.8.1-v1.8.1
replicas: 1
# resources:
# requests:
Expand All @@ -359,7 +359,7 @@ clair:
enabled: true
image:
repository: goharbor/clair-photon
tag: v2.0.8-v1.8.0
tag: v2.0.8-v1.8.1
replicas: 1
# The http(s) proxy used to update vulnerabilities database from internet
httpProxy:
Expand All @@ -382,7 +382,7 @@ notary:
server:
image:
repository: goharbor/notary-server-photon
tag: v0.6.1-v1.8.0
tag: v0.6.1-v1.8.1
replicas: 1
# resources:
# requests:
Expand All @@ -391,7 +391,7 @@ notary:
signer:
image:
repository: goharbor/notary-signer-photon
tag: v0.6.1-v1.8.0
tag: v0.6.1-v1.8.1
replicas: 1
# resources:
# requests:
Expand All @@ -417,7 +417,7 @@ database:
internal:
image:
repository: goharbor/harbor-db
tag: v1.8.0
tag: v1.8.1
# The initial superuser password for internal database
password: "changeit"
# resources:
Expand Down Expand Up @@ -447,7 +447,7 @@ redis:
internal:
image:
repository: goharbor/redis-photon
tag: v1.8.0
tag: v1.8.1
# resources:
# requests:
# memory: 256Mi
Expand Down

0 comments on commit 01a198e

Please sign in to comment.