Commit 76bdf31c authored by root's avatar root

2.1.3

parent 0f8f5920
apiVersion: v1 apiVersion: v1
name: harbor name: harbor
version: 1.5.1 version: 1.5.3
appVersion: 2.1.1 appVersion: 2.1.3
description: An open source trusted cloud native registry that stores, signs, and scans content description: An open source trusted cloud native registry that stores, signs, and scans content
keywords: keywords:
- docker - docker
......
...@@ -109,4 +109,5 @@ data: ...@@ -109,4 +109,5 @@ data:
{{- end }} {{- end }}
ALIBABA_CLOUD_ACCESS_KEY_ID: {{ $storage.oss.accesskeyid }} ALIBABA_CLOUD_ACCESS_KEY_ID: {{ $storage.oss.accesskeyid }}
{{- end }} {{- end }}
STORAGE_TIMESTAMP_TOLERANCE: 1s
{{- end }} {{- end }}
...@@ -42,14 +42,16 @@ spec: ...@@ -42,14 +42,16 @@ spec:
- name: core - name: core
image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }}
imagePullPolicy: {{ .Values.imagePullPolicy }} imagePullPolicy: {{ .Values.imagePullPolicy }}
# startupProbe: {{- if .Values.core.startupProbe.enabled }}
# httpGet: startupProbe:
# path: /api/v2.0/ping httpGet:
# scheme: {{ include "harbor.component.scheme" . | upper }} path: /api/v2.0/ping
# port: {{ template "harbor.core.containerPort" . }} scheme: {{ include "harbor.component.scheme" . | upper }}
# failureThreshold: 360 port: {{ template "harbor.core.containerPort" . }}
# initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} failureThreshold: 360
# periodSeconds: 10 initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }}
periodSeconds: 10
{{- end }}
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /api/v2.0/ping path: /api/v2.0/ping
......
{{- if .Capabilities.APIVersions.Has "bcc.bd-apaas.com/v1alpha1/IngressRoute" -}}
{{- else }}
{{- if eq .Values.expose.type "ingress" }} {{- if eq .Values.expose.type "ingress" }}
{{- $ingress := .Values.expose.ingress -}} {{- $ingress := .Values.expose.ingress -}}
{{- $tls := .Values.expose.tls -}} {{- $tls := .Values.expose.tls -}}
...@@ -23,11 +19,11 @@ ...@@ -23,11 +19,11 @@
{{- $_ := set . "notary_path" "/.*" -}} {{- $_ := set . "notary_path" "/.*" -}}
{{- else }} {{- else }}
{{- $_ := set . "portal_path" "/" -}} {{- $_ := set . "portal_path" "/" -}}
{{- $_ := set . "api_path" "/api/" -}} {{- $_ := set . "api_path" "/api" -}}
{{- $_ := set . "service_path" "/service/" -}} {{- $_ := set . "service_path" "/service" -}}
{{- $_ := set . "v2_path" "/v2/" -}} {{- $_ := set . "v2_path" "/v2" -}}
{{- $_ := set . "chartrepo_path" "/chartrepo/" -}} {{- $_ := set . "chartrepo_path" "/chartrepo" -}}
{{- $_ := set . "controller_path" "/c/" -}} {{- $_ := set . "controller_path" "/c" -}}
{{- $_ := set . "notary_path" "/" -}} {{- $_ := set . "notary_path" "/" -}}
{{- end }} {{- end }}
...@@ -135,4 +131,3 @@ spec: ...@@ -135,4 +131,3 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end -}}
\ No newline at end of file
...@@ -375,7 +375,7 @@ proxy: ...@@ -375,7 +375,7 @@ proxy:
nginx: nginx:
image: image:
repository: goharbor/nginx-photon repository: goharbor/nginx-photon
tag: v2.1.1 tag: v2.1.3
# set the service account to be used, default if left empty # set the service account to be used, default if left empty
serviceAccountName: "" serviceAccountName: ""
replicas: 1 replicas: 1
...@@ -392,7 +392,7 @@ nginx: ...@@ -392,7 +392,7 @@ nginx:
portal: portal:
image: image:
repository: goharbor/harbor-portal repository: goharbor/harbor-portal
tag: v2.1.1 tag: v2.1.3
# set the service account to be used, default if left empty # set the service account to be used, default if left empty
serviceAccountName: "" serviceAccountName: ""
replicas: 1 replicas: 1
...@@ -409,12 +409,13 @@ portal: ...@@ -409,12 +409,13 @@ portal:
core: core:
image: image:
repository: goharbor/harbor-core repository: goharbor/harbor-core
tag: v2.1.1 tag: v2.1.3
# set the service account to be used, default if left empty # set the service account to be used, default if left empty
serviceAccountName: "" serviceAccountName: ""
replicas: 1 replicas: 1
## Startup probe values ## Startup probe values
startupProbe: startupProbe:
enabled: true
initialDelaySeconds: 10 initialDelaySeconds: 10
# resources: # resources:
# requests: # requests:
...@@ -442,7 +443,7 @@ core: ...@@ -442,7 +443,7 @@ core:
jobservice: jobservice:
image: image:
repository: goharbor/harbor-jobservice repository: goharbor/harbor-jobservice
tag: v2.1.1 tag: v2.1.3
replicas: 1 replicas: 1
# set the service account to be used, default if left empty # set the service account to be used, default if left empty
serviceAccountName: "" serviceAccountName: ""
...@@ -469,7 +470,7 @@ registry: ...@@ -469,7 +470,7 @@ registry:
registry: registry:
image: image:
repository: goharbor/registry-photon repository: goharbor/registry-photon
tag: v2.1.1 tag: v2.1.3
# resources: # resources:
# requests: # requests:
# memory: 256Mi # memory: 256Mi
...@@ -477,7 +478,7 @@ registry: ...@@ -477,7 +478,7 @@ registry:
controller: controller:
image: image:
repository: goharbor/harbor-registryctl repository: goharbor/harbor-registryctl
tag: v2.1.1 tag: v2.1.3
# resources: # resources:
# requests: # requests:
...@@ -524,7 +525,7 @@ chartmuseum: ...@@ -524,7 +525,7 @@ chartmuseum:
absoluteUrl: false absoluteUrl: false
image: image:
repository: goharbor/chartmuseum-photon repository: goharbor/chartmuseum-photon
tag: v2.1.1 tag: v2.1.3
replicas: 1 replicas: 1
# resources: # resources:
# requests: # requests:
...@@ -543,7 +544,7 @@ clair: ...@@ -543,7 +544,7 @@ clair:
clair: clair:
image: image:
repository: goharbor/clair-photon repository: goharbor/clair-photon
tag: v2.1.1 tag: v2.1.3
# resources: # resources:
# requests: # requests:
# memory: 256Mi # memory: 256Mi
...@@ -551,7 +552,7 @@ clair: ...@@ -551,7 +552,7 @@ clair:
adapter: adapter:
image: image:
repository: goharbor/clair-adapter-photon repository: goharbor/clair-adapter-photon
tag: v2.1.1 tag: v2.1.3
# resources: # resources:
# requests: # requests:
# memory: 256Mi # memory: 256Mi
...@@ -573,7 +574,7 @@ trivy: ...@@ -573,7 +574,7 @@ trivy:
# repository the repository for Trivy adapter image # repository the repository for Trivy adapter image
repository: goharbor/trivy-adapter-photon repository: goharbor/trivy-adapter-photon
# tag the tag for Trivy adapter image # tag the tag for Trivy adapter image
tag: v2.1.1 tag: v2.1.3
# set the service account to be used, default if left empty # set the service account to be used, default if left empty
serviceAccountName: "" serviceAccountName: ""
# replicas the number of Pod replicas # replicas the number of Pod replicas
...@@ -630,7 +631,7 @@ notary: ...@@ -630,7 +631,7 @@ notary:
serviceAccountName: "" serviceAccountName: ""
image: image:
repository: goharbor/notary-server-photon repository: goharbor/notary-server-photon
tag: v2.1.1 tag: v2.1.3
replicas: 1 replicas: 1
# resources: # resources:
# requests: # requests:
...@@ -641,7 +642,7 @@ notary: ...@@ -641,7 +642,7 @@ notary:
serviceAccountName: "" serviceAccountName: ""
image: image:
repository: goharbor/notary-signer-photon repository: goharbor/notary-signer-photon
tag: v2.1.1 tag: v2.1.3
replicas: 1 replicas: 1
# resources: # resources:
# requests: # requests:
...@@ -669,7 +670,7 @@ database: ...@@ -669,7 +670,7 @@ database:
serviceAccountName: "" serviceAccountName: ""
image: image:
repository: goharbor/harbor-db repository: goharbor/harbor-db
tag: v2.1.1 tag: v2.1.3
# The initial superuser password for internal database # The initial superuser password for internal database
password: "changeit" password: "changeit"
# resources: # resources:
...@@ -715,7 +716,7 @@ redis: ...@@ -715,7 +716,7 @@ redis:
serviceAccountName: "" serviceAccountName: ""
image: image:
repository: goharbor/redis-photon repository: goharbor/redis-photon
tag: v2.1.1 tag: v2.1.3
# resources: # resources:
# requests: # requests:
# memory: 256Mi # memory: 256Mi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment