diff --git a/Chart.yaml b/Chart.yaml index baa2c4320688b6607bb7217e541aaed01a798ea2..d614d9379e64a5efa4ae1f8b6b4922fbb809d1c6 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: harbor -version: 1.5.1 -appVersion: 2.1.1 +version: 1.5.3 +appVersion: 2.1.3 description: An open source trusted cloud native registry that stores, signs, and scans content keywords: - docker diff --git a/templates/chartmuseum/chartmuseum-cm.yaml b/templates/chartmuseum/chartmuseum-cm.yaml index ce8902c381cdb28b89a4837fcc1abde1badb4d24..9777ca2781b827b44369ea690ecbab21fe529bad 100644 --- a/templates/chartmuseum/chartmuseum-cm.yaml +++ b/templates/chartmuseum/chartmuseum-cm.yaml @@ -109,4 +109,5 @@ data: {{- end }} ALIBABA_CLOUD_ACCESS_KEY_ID: {{ $storage.oss.accesskeyid }} {{- end }} + STORAGE_TIMESTAMP_TOLERANCE: 1s {{- end }} diff --git a/templates/core/core-dpl.yaml b/templates/core/core-dpl.yaml index ceac1b2d4cd52e1099b90179a432edba5eb7828f..b519929ccec746695bac76c1ae3ea424a74a7860 100644 --- a/templates/core/core-dpl.yaml +++ b/templates/core/core-dpl.yaml @@ -42,14 +42,16 @@ spec: - name: core image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} - # startupProbe: - # httpGet: - # path: /api/v2.0/ping - # scheme: {{ include "harbor.component.scheme" . | upper }} - # port: {{ template "harbor.core.containerPort" . }} - # failureThreshold: 360 - # initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} - # periodSeconds: 10 + {{- if .Values.core.startupProbe.enabled }} + startupProbe: + httpGet: + path: /api/v2.0/ping + scheme: {{ include "harbor.component.scheme" . | upper }} + port: {{ template "harbor.core.containerPort" . }} + failureThreshold: 360 + initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} + periodSeconds: 10 + {{- end }} livenessProbe: httpGet: path: /api/v2.0/ping diff --git a/templates/ingress/ingress.yaml b/templates/ingress/ingress.yaml index e4eef8d34afbe50617783c9a29d3292635dadf3b..b0080dcad388c0add8e708583c7336bcc8a8b93f 100644 --- a/templates/ingress/ingress.yaml +++ b/templates/ingress/ingress.yaml @@ -1,7 +1,3 @@ -{{- if .Capabilities.APIVersions.Has "bcc.bd-apaas.com/v1alpha1/IngressRoute" -}} - -{{- else }} - {{- if eq .Values.expose.type "ingress" }} {{- $ingress := .Values.expose.ingress -}} {{- $tls := .Values.expose.tls -}} @@ -23,11 +19,11 @@ {{- $_ := set . "notary_path" "/.*" -}} {{- else }} {{- $_ := set . "portal_path" "/" -}} - {{- $_ := set . "api_path" "/api/" -}} - {{- $_ := set . "service_path" "/service/" -}} - {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} - {{- $_ := set . "controller_path" "/c/" -}} + {{- $_ := set . "api_path" "/api" -}} + {{- $_ := set . "service_path" "/service" -}} + {{- $_ := set . "v2_path" "/v2" -}} + {{- $_ := set . "chartrepo_path" "/chartrepo" -}} + {{- $_ := set . "controller_path" "/c" -}} {{- $_ := set . "notary_path" "/" -}} {{- end }} @@ -135,4 +131,3 @@ spec: {{- end }} {{- end }} -{{- end -}} \ No newline at end of file diff --git a/values.yaml b/values.yaml index ca201455680b024132a2abe95df3262ede2583ae..7bff227d5d56fd0ba82c57382280d74ba15b4eac 100644 --- a/values.yaml +++ b/values.yaml @@ -9,7 +9,7 @@ expose: # images. Refer to https://github.com/goharbor/harbor/issues/5291 # for the detail. enabled: true - # The source of the tls certificate. Set it as "auto", "secret" + # The source of the tls certificate. Set it as "auto", "secret" # or "none" and fill the information in the corresponding section # 1) auto: generate the tls certificate automatically # 2) secret: read the tls certificate from the specified secret. @@ -375,7 +375,7 @@ proxy: nginx: image: repository: goharbor/nginx-photon - tag: v2.1.1 + tag: v2.1.3 # set the service account to be used, default if left empty serviceAccountName: "" replicas: 1 @@ -392,7 +392,7 @@ nginx: portal: image: repository: goharbor/harbor-portal - tag: v2.1.1 + tag: v2.1.3 # set the service account to be used, default if left empty serviceAccountName: "" replicas: 1 @@ -409,12 +409,13 @@ portal: core: image: repository: goharbor/harbor-core - tag: v2.1.1 + tag: v2.1.3 # set the service account to be used, default if left empty serviceAccountName: "" replicas: 1 ## Startup probe values startupProbe: + enabled: true initialDelaySeconds: 10 # resources: # requests: @@ -442,7 +443,7 @@ core: jobservice: image: repository: goharbor/harbor-jobservice - tag: v2.1.1 + tag: v2.1.3 replicas: 1 # set the service account to be used, default if left empty serviceAccountName: "" @@ -469,7 +470,7 @@ registry: registry: image: repository: goharbor/registry-photon - tag: v2.1.1 + tag: v2.1.3 # resources: # requests: # memory: 256Mi @@ -477,7 +478,7 @@ registry: controller: image: repository: goharbor/harbor-registryctl - tag: v2.1.1 + tag: v2.1.3 # resources: # requests: @@ -524,7 +525,7 @@ chartmuseum: absoluteUrl: false image: repository: goharbor/chartmuseum-photon - tag: v2.1.1 + tag: v2.1.3 replicas: 1 # resources: # requests: @@ -543,7 +544,7 @@ clair: clair: image: repository: goharbor/clair-photon - tag: v2.1.1 + tag: v2.1.3 # resources: # requests: # memory: 256Mi @@ -551,7 +552,7 @@ clair: adapter: image: repository: goharbor/clair-adapter-photon - tag: v2.1.1 + tag: v2.1.3 # resources: # requests: # memory: 256Mi @@ -573,7 +574,7 @@ trivy: # repository the repository for Trivy adapter image repository: goharbor/trivy-adapter-photon # 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 serviceAccountName: "" # replicas the number of Pod replicas @@ -630,7 +631,7 @@ notary: serviceAccountName: "" image: repository: goharbor/notary-server-photon - tag: v2.1.1 + tag: v2.1.3 replicas: 1 # resources: # requests: @@ -641,7 +642,7 @@ notary: serviceAccountName: "" image: repository: goharbor/notary-signer-photon - tag: v2.1.1 + tag: v2.1.3 replicas: 1 # resources: # requests: @@ -669,7 +670,7 @@ database: serviceAccountName: "" image: repository: goharbor/harbor-db - tag: v2.1.1 + tag: v2.1.3 # The initial superuser password for internal database password: "changeit" # resources: @@ -715,7 +716,7 @@ redis: serviceAccountName: "" image: repository: goharbor/redis-photon - tag: v2.1.1 + tag: v2.1.3 # resources: # requests: # memory: 256Mi