Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-04 23:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/harbor] Fix trivy statefulset upgrade (#2853)

Browse Source 
* [bitnami/harbor] Fix trivy statefulset upgrade

* Add quotes

* [bitnami/harbor] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Javier J. Salmerón-García
2020-06-17 15:06:09 +02:00
committed by GitHub
parent 6e59b3e8e5
commit ab23fc07c2
5 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bitnami/harbor/README.md
View File

@@ -828,6 +828,21 @@ You can enable this initContainer by setting `volumePermissions.enabled` to `tru
> 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.
## 6.0.0 to 6.0.2
Due to an issue with Trivy volumeClaimTemplates, the upgrade needs to be done in two steps:
- Upgrade the chart to 6.0.2 with `trivy.enabled=false`
```console
$ helm upgrade bitnami/chart --version 6.0.2 --set trivy.enabled=false <REST OF THE UPGRADE PARAMETERS>
```
- Execute a new upgrade setting `trivy.enabled=true`
```console
$ helm upgrade bitnami/chart --set trivy.enabled=true <REST OF THE UPGRADE PARAMETERS>
```
## 6.0.0
The chart was changed to adapt to the common Bitnami chart standards. Now it includes common elements such as sidecar and init container support, custom commands, custom liveness/readiness probes, extra environment variables support, extra pod annotations and labels, among others. In addition, it adds a new Trivy deployment for image scanning.

6
bitnami/harbor/requirements.lock
View File

@@ -4,9 +4,9 @@ dependencies:
version: 8.10.5
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 10.7.1
version: 10.7.2
- name: common
repository: https://charts.bitnami.com/bitnami
version: 0.3.1
digest: sha256:65843695acbd9219736603cef56f06e14878534a21999acc020d1ff433c0e8f0
generated: "2020-06-12T14:41:57.691609339Z"
digest: sha256:dfdeca460fe0c3f6c13789c155b9b6b711db54c467f2f5455d954053ebadc34e
generated: "2020-06-17T09:15:43.272455335Z"

2
bitnami/harbor/templates/trivy/trivy-sts.yaml
View File

@@ -175,7 +175,7 @@ spec:
volumeClaimTemplates:
- metadata:
name: data
labels: {{- include "common.labels.standard" . | nindent 10 }}
labels: {{- include "common.labels.matchLabels" . | nindent 10 }}
spec:
accessModes:
- {{ .Values.persistence.persistentVolumeClaim.trivy.accessMode | quote }}

14
bitnami/harbor/values-production.yaml
View File

@@ -39,7 +39,7 @@ coreImage:
portalImage:
registry: docker.io
repository: bitnami/harbor-portal
tag: 2.0.0-debian-10-r5
tag: 2.0.0-debian-10-r6
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -115,7 +115,7 @@ chartMuseumImage:
registryImage:
registry: docker.io
repository: bitnami/harbor-registry
tag: 2.0.0-debian-10-r11
tag: 2.0.0-debian-10-r12
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -190,7 +190,7 @@ trivyImage:
clairImage:
registry: docker.io
repository: bitnami/harbor-clair
tag: 2.0.0-debian-10-r11
tag: 2.0.0-debian-10-r12
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -216,7 +216,7 @@ clairImage:
clairAdapterImage:
registry: docker.io
repository: bitnami/harbor-adapter-clair
tag: 2.0.0-debian-10-r7
tag: 2.0.0-debian-10-r8
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -241,7 +241,7 @@ clairAdapterImage:
notaryServerImage:
registry: docker.io
repository: bitnami/harbor-notary-server
tag: 2.0.0-debian-10-r10
tag: 2.0.0-debian-10-r11
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -266,7 +266,7 @@ notaryServerImage:
notarySignerImage:
registry: docker.io
repository: bitnami/harbor-notary-signer
tag: 2.0.0-debian-10-r10
tag: 2.0.0-debian-10-r11
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -291,7 +291,7 @@ notarySignerImage:
nginxImage:
registry: docker.io
repository: bitnami/nginx
tag: 1.17.10-debian-10-r70
tag: 1.17.10-debian-10-r71
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

14
bitnami/harbor/values.yaml
View File

@@ -39,7 +39,7 @@ coreImage:
portalImage:
registry: docker.io
repository: bitnami/harbor-portal
tag: 2.0.0-debian-10-r5
tag: 2.0.0-debian-10-r6
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -115,7 +115,7 @@ chartMuseumImage:
registryImage:
registry: docker.io
repository: bitnami/harbor-registry
tag: 2.0.0-debian-10-r11
tag: 2.0.0-debian-10-r12
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -190,7 +190,7 @@ trivyImage:
clairImage:
registry: docker.io
repository: bitnami/harbor-clair
tag: 2.0.0-debian-10-r11
tag: 2.0.0-debian-10-r12
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -216,7 +216,7 @@ clairImage:
clairAdapterImage:
registry: docker.io
repository: bitnami/harbor-adapter-clair
tag: 2.0.0-debian-10-r7
tag: 2.0.0-debian-10-r8
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -241,7 +241,7 @@ clairAdapterImage:
notaryServerImage:
registry: docker.io
repository: bitnami/harbor-notary-server
tag: 2.0.0-debian-10-r10
tag: 2.0.0-debian-10-r11
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -266,7 +266,7 @@ notaryServerImage:
notarySignerImage:
registry: docker.io
repository: bitnami/harbor-notary-signer
tag: 2.0.0-debian-10-r10
tag: 2.0.0-debian-10-r11
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -291,7 +291,7 @@ notarySignerImage:
nginxImage:
registry: docker.io
repository: bitnami/nginx
tag: 1.17.10-debian-10-r70
tag: 1.17.10-debian-10-r71
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images