Skip to content

Commit 25937eb

Browse files
andresbonoBitnami Containers
andresbono
and
Bitnami Containers
authored
[bitnami/harbor] Update Harbor 2.2.0 and adapt Clair component (#5743)
* Adapt clair component to latest version of Harbor * Move section in NOTES.txt * [bitnami/harbor] Update components versions Signed-off-by: Bitnami Containers <containers@bitnami.com> Co-authored-by: Bitnami Containers <containers@bitnami.com>
1 parent 0d8b400 commit 25937eb

File tree

7 files changed

+37
-31
lines changed

7 files changed

+37
-31
lines changed

‎bitnami/harbor/Chart.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies:
22
- name: postgresql
33
repository: https://charts.bitnami.com/bitnami
4-
version: 10.3.6
4+
version: 10.3.12
55
- name: redis
66
repository: https://charts.bitnami.com/bitnami
7-
version: 12.7.6
7+
version: 12.8.3
88
- name: common
99
repository: https://charts.bitnami.com/bitnami
1010
version: 1.4.1
11-
digest: sha256:f9c6cd934dfb2141d1736642eabeef1db9991534693f8b68e92a723b9af2e483
12-
generated: "2021-02-24T13:33:25.589623838Z"
11+
digest: sha256:b16934d03ea440352c7f9d2d5a30db3dfb1134199b99eea50c66f304ba42e3df
12+
generated: "2021-03-11T16:19:38.227689858Z"

‎bitnami/harbor/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
annotations:
22
category: Infrastructure
33
apiVersion: v2
4-
appVersion: 2.1.3
4+
appVersion: 2.2.0
55
dependencies:
66
- condition: postgresql.enabled
77
name: postgresql
@@ -34,4 +34,4 @@ sources:
3434
- https://github.com/bitnami/bitnami-docker-harbor-registry
3535
- https://github.com/bitnami/bitnami-docker-harbor-registryctl
3636
- https://goharbor.io/
37-
version: 9.6.3
37+
version: 9.7.0

‎bitnami/harbor/README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ The following tables list the configurable parameters of the Harbor chart and th
524524
| `clairAdapterImage.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
525525
| `clairAdapterImage.debug` | Specify if debug logs should be enabled | `false` |
526526
| `clair.updateStrategy` | The update strategy for deployments with persistent volumes: RollingUpdate or Recreate. Set it as Recreate when RWM for volumes isn't supported | `RollingUpdate` |
527-
| `clair.enabled` | Enable Clair | `true` |
527+
| `clair.enabled` | Enable Clair scanner. Add it as an additional interrogation service by following https://goharbor.io/docs/latest/administration/vulnerability-scanning/pluggable-scanners | `false` |
528528
| `clair.replicas` | The replica count | `1` |
529529
| `clair.httpProxy` | The http proxy used to update vulnerabilities database from internet | undefined |
530530
| `clair.httpsProxy` | The https proxy used to update vulnerabilities database from internet | undefined |
@@ -874,6 +874,12 @@ Find more information about how to deal with common errors related to Bitnami’
874874

875875
> NOTE: In you are upgrading an installation that contains a high amount of data, it is recommended to disable the liveness/readiness probes as the migration can take a substantial amount of time.
876876

877+
### To 9.7.0
878+
879+
This new version of the chart bumps the version of Harbor to [`2.2.0`](https://github.com/goharbor/harbor/releases/tag/v2.2.0) which deprecates built-in Clair. If you still want to use Clair, you will need to set `clair.enabled` to `true` and Clair scanner and the Harbor adapter will be deployed. Follow [these steps](https://goharbor.io/docs/latest/administration/vulnerability-scanning/pluggable-scanners) to add it as an additional interrogation service for Harbor.
880+
881+
Please note that Clair might be fully deprecated from this chart in following updates.
882+
877883
### To 9.0.0
878884

879885
[On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL.

‎bitnami/harbor/templates/NOTES.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,17 @@
4242
echo Username: "admin"
4343
echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "harbor.core" . }}-envvars -o jsonpath="{.data.HARBOR_ADMIN_PASSWORD}" | base64 --decode)
4444

45+
{{- if .Values.clair.enabled }}
46+
47+
Clair scanner was deployed. Follow these steps to add it as an additional interrogation service for Harbor:
48+
https://goharbor.io/docs/latest/administration/vulnerability-scanning/pluggable-scanners
49+
50+
Endpoint: {{ include "harbor.clairAdapter.url" . | quote }}
51+
Authorization: "None"
52+
Options: "Use internal registry address"
53+
54+
{{- end }}
55+
4556
{{ include "harbor.validateValues" . }}
4657
{{ include "harbor.checkRollingTags" . }}
4758

‎bitnami/harbor/templates/core/core-cm-envvars.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ data:
2828
CORE_LOCAL_URL: "{{ ternary "https://127.0.0.1:8443" "http://127.0.0.1:8080" .Values.internalTLS.enabled }}"
2929
CFG_EXPIRATION: "5"
3030
ADMIRAL_URL: "NA"
31-
WITH_CLAIR: {{ .Values.clair.enabled | quote }}
32-
CLAIR_DB_HOST: {{ include "harbor.database.host" . | quote }}
33-
CLAIR_DB_PORT: {{ include "harbor.database.port" . | quote }}
34-
CLAIR_DB_USERNAME: {{ include "harbor.database.clairUsername" . | quote }}
35-
CLAIR_DB: {{ include "harbor.database.clairDatabase" . | quote }}
36-
CLAIR_DB_SSLMODE: {{ include "harbor.database.sslmode" . | quote }}
37-
CLAIR_URL: {{ printf "http://%s:6060" (include "harbor.clair" .) | quote }}
38-
CLAIR_ADAPTER_URL: {{ include "harbor.clairAdapter.url" . | quote }}
3931
WITH_TRIVY: {{ .Values.trivy.enabled | quote }}
4032
TRIVY_ADAPTER_URL: {{ include "harbor.trivy.url" . | quote }}
4133
REGISTRY_STORAGE_PROVIDER_NAME: {{ .Values.persistence.imageChartStorage.type | quote }}

‎bitnami/harbor/templates/core/core-secret-envvars.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,3 @@ data:
2929
HARBOR_ADMIN_PASSWORD: {{ required "A Harbor Admin Password is required!" .Values.harborAdminPassword }}
3030
{{- end }}
3131
POSTGRESQL_PASSWORD: {{ template "harbor.database.encryptedPassword" . }}
32-
{{- if .Values.clair.enabled }}
33-
CLAIR_DB_PASSWORD: {{ template "harbor.database.encryptedClairPassword" . }}
34-
{{- end }}

‎bitnami/harbor/values.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
coreImage:
1515
registry: docker.io
1616
repository: bitnami/harbor-core
17-
tag: 2.1.3-debian-10-r38
17+
tag: 2.2.0-debian-10-r11
1818
## Specify a imagePullPolicy
1919
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
2020
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -38,7 +38,7 @@ coreImage:
3838
portalImage:
3939
registry: docker.io
4040
repository: bitnami/harbor-portal
41-
tag: 2.1.3-debian-10-r39
41+
tag: 2.2.0-debian-10-r0
4242
## Specify a imagePullPolicy
4343
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
4444
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -63,7 +63,7 @@ portalImage:
6363
jobserviceImage:
6464
registry: docker.io
6565
repository: bitnami/harbor-jobservice
66-
tag: 2.2.0-debian-10-r0
66+
tag: 2.2.0-debian-10-r14
6767
## Specify a imagePullPolicy
6868
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
6969
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -87,7 +87,7 @@ jobserviceImage:
8787
chartMuseumImage:
8888
registry: docker.io
8989
repository: bitnami/chartmuseum
90-
tag: 0.13.0-debian-10-r19
90+
tag: 0.13.0-debian-10-r33
9191
## Specify a imagePullPolicy
9292
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
9393
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -111,7 +111,7 @@ chartMuseumImage:
111111
registryImage:
112112
registry: docker.io
113113
repository: bitnami/harbor-registry
114-
tag: 2.1.3-debian-10-r40
114+
tag: 2.2.0-debian-10-r13
115115
## Specify a imagePullPolicy
116116
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
117117
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -135,7 +135,7 @@ registryImage:
135135
registryctlImage:
136136
registry: docker.io
137137
repository: bitnami/harbor-registryctl
138-
tag: 2.1.3-debian-10-r39
138+
tag: 2.2.0-debian-10-r13
139139
## Specify a imagePullPolicy
140140
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
141141
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -159,7 +159,7 @@ registryctlImage:
159159
trivyImage:
160160
registry: docker.io
161161
repository: bitnami/harbor-adapter-trivy
162-
tag: 2.1.3-debian-10-r38
162+
tag: 2.2.0-debian-10-r13
163163
## Specify a imagePullPolicy
164164
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
165165
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -183,7 +183,7 @@ trivyImage:
183183
clairImage:
184184
registry: docker.io
185185
repository: bitnami/harbor-clair
186-
tag: 2.1.3-debian-10-r39
186+
tag: 2.2.0-debian-10-r0
187187
## Specify a imagePullPolicy
188188
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
189189
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -208,7 +208,7 @@ clairImage:
208208
clairAdapterImage:
209209
registry: docker.io
210210
repository: bitnami/harbor-adapter-clair
211-
tag: 2.1.3-debian-10-r38
211+
tag: 2.2.0-debian-10-r0
212212
## Specify a imagePullPolicy
213213
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
214214
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -232,7 +232,7 @@ clairAdapterImage:
232232
notaryServerImage:
233233
registry: docker.io
234234
repository: bitnami/harbor-notary-server
235-
tag: 2.1.3-debian-10-r39
235+
tag: 2.2.0-debian-10-r10
236236
## Specify a imagePullPolicy
237237
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
238238
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -256,7 +256,7 @@ notaryServerImage:
256256
notarySignerImage:
257257
registry: docker.io
258258
repository: bitnami/harbor-notary-signer
259-
tag: 2.1.3-debian-10-r40
259+
tag: 2.2.0-debian-10-r10
260260
## Specify a imagePullPolicy
261261
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
262262
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -280,7 +280,7 @@ notarySignerImage:
280280
nginxImage:
281281
registry: docker.io
282282
repository: bitnami/nginx
283-
tag: 1.19.7-debian-10-r7
283+
tag: 1.19.8-debian-10-r1
284284
## Specify a imagePullPolicy
285285
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
286286
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -1837,7 +1837,7 @@ chartmuseum:
18371837
## Clair parameters
18381838
##
18391839
clair:
1840-
enabled: true
1840+
enabled: false
18411841

18421842
replicas: 1
18431843

0 commit comments

Comments
 (0)