From c11fa5bbdd9233f5f47bd44bd4a08ae8f7bdb39a Mon Sep 17 00:00:00 2001 From: "DASTC\\gupta_rajan" Date: Thu, 29 Dec 2022 15:54:20 +0800 Subject: [PATCH 1/8] Add scandata pvc for harbor jobservice --- bitnami/harbor/Chart.yaml | 2 +- bitnami/harbor/README.md | 7 ++++ bitnami/harbor/templates/_helpers.tpl | 4 +++ .../templates/jobservice/jobservice-dpl.yaml | 10 ++++++ .../jobservice/jobservice-scandata-pvc.yaml | 34 +++++++++++++++++++ bitnami/harbor/values.yaml | 18 ++++++++++ 6 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml diff --git a/bitnami/harbor/Chart.yaml b/bitnami/harbor/Chart.yaml index 91151e41506272..93b7901fe74288 100644 --- a/bitnami/harbor/Chart.yaml +++ b/bitnami/harbor/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/harbor-registry - https://github.com/bitnami/containers/tree/main/bitnami/harbor-registryctl - https://goharbor.io/ -version: 16.1.2 +version: 16.2.0 diff --git a/bitnami/harbor/README.md b/bitnami/harbor/README.md index 757acf83923639..c95015c6ee7f0b 100644 --- a/bitnami/harbor/README.md +++ b/bitnami/harbor/README.md @@ -171,6 +171,13 @@ Additionally, if `persistence.resourcePolicy` is set to `keep`, you should manua | `persistence.persistentVolumeClaim.jobservice.size` | The size of the volume | `1Gi` | | `persistence.persistentVolumeClaim.jobservice.annotations` | Annotations for the PVC | `{}` | | `persistence.persistentVolumeClaim.jobservice.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.storageClass` | PVC Storage Class for Harbor Jobservice scan data volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.jobservice.scanData.size` | The size of the volume | `1Gi` | +| `persistence.persistentVolumeClaim.jobservice.scanData.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.selector` | Selector to match an existing Persistent Volume | `{}` | | `persistence.persistentVolumeClaim.chartmuseum.existingClaim` | Name of an existing PVC to use | `""` | | `persistence.persistentVolumeClaim.chartmuseum.storageClass` | PVC Storage Class for Chartmuseum data volume | `""` | | `persistence.persistentVolumeClaim.chartmuseum.subPath` | The sub path used in the volume | `""` | diff --git a/bitnami/harbor/templates/_helpers.tpl b/bitnami/harbor/templates/_helpers.tpl index b232b7546ca1a7..99a6fc98c8ea15 100644 --- a/bitnami/harbor/templates/_helpers.tpl +++ b/bitnami/harbor/templates/_helpers.tpl @@ -341,6 +341,10 @@ Return whether Redis® uses password authentication or not {{- printf "%s-jobservice" (include "common.names.fullname" .) -}} {{- end -}} +{{- define "harbor.jobserviceScanData" -}} + {{- printf "%s-jobservice-scandata" (include "common.names.fullname" .) -}} +{{- end -}} + {{- define "harbor.registry" -}} {{- printf "%s-registry" (include "common.names.fullname" .) -}} {{- end -}} diff --git a/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml b/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml index 0c2193aa97fe7f..bf3366c98db11b 100644 --- a/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml +++ b/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml @@ -202,6 +202,9 @@ spec: - name: job-logs mountPath: /var/log/jobs subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.subPath }} + - name: jobservice-scandata + mountPath: /var/scandata_exports + subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanData.subPath }} {{- if .Values.internalTLS.enabled }} - name: internal-tls-certs mountPath: /etc/harbor/ssl/jobservice @@ -226,6 +229,13 @@ spec: {{- else }} emptyDir: {} {{- end }} + - name: jobservice-scandata + {{- if and .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanData.existingClaim | default (include "harbor.jobserviceScanData" .) }} + {{- else }} + emptyDir: {} + {{- end }} {{- if .Values.internalTLS.caBundleSecret }} {{- include "harbor.caBundleVolume" . | nindent 8 }} {{- end }} diff --git a/bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml b/bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml new file mode 100644 index 00000000000000..70592dd7aceb71 --- /dev/null +++ b/bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml @@ -0,0 +1,34 @@ +{{- if and .Values.persistence.enabled (not .Values.persistence.persistentVolumeClaim.jobservice.scanData.existingClaim) }} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ include "harbor.jobserviceScanData" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + app.kubernetes.io/component: jobservice + annotations: + {{- if eq .Values.persistence.resourcePolicy "keep" }} + helm.sh/resource-policy: keep + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.persistence.persistentVolumeClaim.jobservice.scanData.annotations }} + {{- toYaml .Values.persistence.persistentVolumeClaim.jobservice.scanData.annotations | nindent 4 }} + {{- end }} +spec: + accessModes: + {{- range .Values.persistence.persistentVolumeClaim.jobservice.scanData.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanData.size }} + {{- if .Values.persistence.persistentVolumeClaim.jobservice.scanData.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.persistentVolumeClaim.jobservice.scanData.selector "context" $) | nindent 2 }} + {{- end }} + {{- include "common.storage.class" ( dict "persistence" .Values.persistence.persistentVolumeClaim.jobservice.scanData "global" .Values.global ) | nindent 2 }} +{{- end }} diff --git a/bitnami/harbor/values.yaml b/bitnami/harbor/values.yaml index d36cb67e499e66..816376bed31a41 100644 --- a/bitnami/harbor/values.yaml +++ b/bitnami/harbor/values.yaml @@ -462,6 +462,24 @@ persistence: size: 1Gi annotations: {} selector: {} + ## @param persistence.persistentVolumeClaim.jobservice.scanData.existingClaim Name of an existing PVC to use + ## @param persistence.persistentVolumeClaim.jobservice.scanData.storageClass PVC Storage Class for Harbor Jobservice data volume + ## Note: The default StorageClass will be used if not defined. Set it to `-` to disable dynamic provisioning + ## @param persistence.persistentVolumeClaim.jobservice.scanData.subPath The sub path used in the volume + ## @param persistence.persistentVolumeClaim.jobservice.scanData.accessModes The access mode of the volume + ## @param persistence.persistentVolumeClaim.jobservice.scanData.size The size of the volume + ## @param persistence.persistentVolumeClaim.jobservice.scanData.annotations Annotations for the PVC + ## @param persistence.persistentVolumeClaim.jobservice.scanData.selector Selector to match an existing Persistent Volume + ## + scanData: + existingClaim: "" + storageClass: "" + subPath: "" + accessModes: + - ReadWriteOnce + size: 1Gi + annotations: {} + selector: {} ## @param persistence.persistentVolumeClaim.chartmuseum.existingClaim Name of an existing PVC to use ## @param persistence.persistentVolumeClaim.chartmuseum.storageClass PVC Storage Class for Chartmuseum data volume ## Note: The default StorageClass will be used if not defined. Set it to `-` to disable dynamic provisioning From 74393db9c1369f5b2333f38070d214e42e488b7c Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Thu, 29 Dec 2022 08:04:06 +0000 Subject: [PATCH 2/8] Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --- bitnami/harbor/README.md | 190 +++++++++++++++++++-------------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/bitnami/harbor/README.md b/bitnami/harbor/README.md index c95015c6ee7f0b..7e06c6eb9d095d 100644 --- a/bitnami/harbor/README.md +++ b/bitnami/harbor/README.md @@ -153,101 +153,101 @@ Additionally, if `persistence.resourcePolicy` is set to `keep`, you should manua ### Persistence Parameters -| Name | Description | Value | -| ------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.registry.storageClass` | PVC Storage Class for Harbor Registry data volume | `""` | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.registry.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.registry.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.jobservice.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.jobservice.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.jobservice.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.jobservice.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.jobservice.scanData.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.jobservice.scanData.storageClass` | PVC Storage Class for Harbor Jobservice scan data volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.scanData.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.scanData.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.jobservice.scanData.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.scanData.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.jobservice.scanData.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.chartmuseum.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.chartmuseum.storageClass` | PVC Storage Class for Chartmuseum data volume | `""` | -| `persistence.persistentVolumeClaim.chartmuseum.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.chartmuseum.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.chartmuseum.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.chartmuseum.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.chartmuseum.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.trivy.storageClass` | PVC Storage Class for Trivy data volume | `""` | -| `persistence.persistentVolumeClaim.trivy.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.trivy.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.imageChartStorage.caBundleSecret` | Specify the `caBundleSecret` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and chartmuseum's containers. | `""` | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which do not supported it (such as using MinIO® for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more information about the detail | `false` | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry and chartmuseum. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more information about the detail | `filesystem` | -| `persistence.imageChartStorage.filesystem.rootdirectory` | Filesystem storage type setting: Storage root directory | `/storage` | -| `persistence.imageChartStorage.filesystem.maxthreads` | Filesystem storage type setting: Maximum threads directory | `""` | -| `persistence.imageChartStorage.azure.accountname` | Azure storage type setting: Name of the Azure account | `accountname` | -| `persistence.imageChartStorage.azure.accountkey` | Azure storage type setting: Key of the Azure account | `base64encodedaccountkey` | -| `persistence.imageChartStorage.azure.container` | Azure storage type setting: Container | `containername` | -| `persistence.imageChartStorage.azure.storagePrefix` | Azure storage type setting: Storage prefix | `/azure/harbor/charts` | -| `persistence.imageChartStorage.azure.realm` | Azure storage type setting: Realm of the Azure account | `""` | -| `persistence.imageChartStorage.gcs.bucket` | GCS storage type setting: Bucket name | `bucketname` | -| `persistence.imageChartStorage.gcs.encodedkey` | GCS storage type setting: Base64 encoded key | `base64-encoded-json-key-file` | -| `persistence.imageChartStorage.gcs.rootdirectory` | GCS storage type setting: Root directory name | `""` | -| `persistence.imageChartStorage.gcs.chunksize` | GCS storage type setting: Chunk size name | `""` | -| `persistence.imageChartStorage.s3.region` | S3 storage type setting: Region | `us-west-1` | -| `persistence.imageChartStorage.s3.bucket` | S3 storage type setting: Bucket name | `bucketname` | -| `persistence.imageChartStorage.s3.accesskey` | S3 storage type setting: Access key name | `""` | -| `persistence.imageChartStorage.s3.secretkey` | S3 storage type setting: Secret Key name | `""` | -| `persistence.imageChartStorage.s3.regionendpoint` | S3 storage type setting: Region Endpoint | `""` | -| `persistence.imageChartStorage.s3.encrypt` | S3 storage type setting: Encrypt | `""` | -| `persistence.imageChartStorage.s3.keyid` | S3 storage type setting: Key ID | `""` | -| `persistence.imageChartStorage.s3.secure` | S3 storage type setting: Secure | `""` | -| `persistence.imageChartStorage.s3.skipverify` | S3 storage type setting: TLS skip verification | `""` | -| `persistence.imageChartStorage.s3.v4auth` | S3 storage type setting: V4 authorization | `""` | -| `persistence.imageChartStorage.s3.chunksize` | S3 storage type setting: V4 authorization | `""` | -| `persistence.imageChartStorage.s3.rootdirectory` | S3 storage type setting: Root directory name | `""` | -| `persistence.imageChartStorage.s3.storageClass` | S3 storage type setting: Storage class | `""` | -| `persistence.imageChartStorage.s3.sse` | S3 storage type setting: SSE name | `""` | -| `persistence.imageChartStorage.swift.authurl` | Swift storage type setting: Authentication url | `https://storage.myprovider.com/v3/auth` | -| `persistence.imageChartStorage.swift.username` | Swift storage type setting: Authentication url | `""` | -| `persistence.imageChartStorage.swift.password` | Swift storage type setting: Password | `""` | -| `persistence.imageChartStorage.swift.container` | Swift storage type setting: Container | `""` | -| `persistence.imageChartStorage.swift.region` | Swift storage type setting: Region | `""` | -| `persistence.imageChartStorage.swift.tenant` | Swift storage type setting: Tenant | `""` | -| `persistence.imageChartStorage.swift.tenantid` | Swift storage type setting: TenantID | `""` | -| `persistence.imageChartStorage.swift.domain` | Swift storage type setting: Domain | `""` | -| `persistence.imageChartStorage.swift.domainid` | Swift storage type setting: DomainID | `""` | -| `persistence.imageChartStorage.swift.trustid` | Swift storage type setting: TrustID | `""` | -| `persistence.imageChartStorage.swift.insecureskipverify` | Swift storage type setting: Verification | `""` | -| `persistence.imageChartStorage.swift.chunksize` | Swift storage type setting: Chunk | `""` | -| `persistence.imageChartStorage.swift.prefix` | Swift storage type setting: Prefix | `""` | -| `persistence.imageChartStorage.swift.secretkey` | Swift storage type setting: Secre Key | `""` | -| `persistence.imageChartStorage.swift.accesskey` | Swift storage type setting: Access Key | `""` | -| `persistence.imageChartStorage.swift.authversion` | Swift storage type setting: Auth | `""` | -| `persistence.imageChartStorage.swift.endpointtype` | Swift storage type setting: Endpoint | `""` | -| `persistence.imageChartStorage.swift.tempurlcontainerkey` | Swift storage type setting: Temp URL container key | `""` | -| `persistence.imageChartStorage.swift.tempurlmethods` | Swift storage type setting: Temp URL methods | `""` | -| `persistence.imageChartStorage.oss.accesskeyid` | OSS storage type setting: Access key ID | `""` | -| `persistence.imageChartStorage.oss.accesskeysecret` | OSS storage type setting: Access key secret name containing the token | `""` | -| `persistence.imageChartStorage.oss.region` | OSS storage type setting: Region name | `""` | -| `persistence.imageChartStorage.oss.bucket` | OSS storage type setting: Bucket name | `""` | -| `persistence.imageChartStorage.oss.endpoint` | OSS storage type setting: Endpoint | `""` | -| `persistence.imageChartStorage.oss.internal` | OSS storage type setting: Internal | `""` | -| `persistence.imageChartStorage.oss.encrypt` | OSS storage type setting: Encrypt | `""` | -| `persistence.imageChartStorage.oss.secure` | OSS storage type setting: Secure | `""` | -| `persistence.imageChartStorage.oss.chunksize` | OSS storage type setting: Chunk | `""` | -| `persistence.imageChartStorage.oss.rootdirectory` | OSS storage type setting: Directory | `""` | -| `persistence.imageChartStorage.oss.secretkey` | OSS storage type setting: Secret key | `""` | +| Name | Description | Value | +| --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- | +| `persistence.enabled` | Enable the data persistence or not | `true` | +| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted | `keep` | +| `persistence.persistentVolumeClaim.registry.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.registry.storageClass` | PVC Storage Class for Harbor Registry data volume | `""` | +| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.registry.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | +| `persistence.persistentVolumeClaim.registry.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.registry.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.jobservice.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.jobservice.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.jobservice.size` | The size of the volume | `1Gi` | +| `persistence.persistentVolumeClaim.jobservice.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.jobservice.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.jobservice.scanData.size` | The size of the volume | `1Gi` | +| `persistence.persistentVolumeClaim.jobservice.scanData.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.chartmuseum.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.chartmuseum.storageClass` | PVC Storage Class for Chartmuseum data volume | `""` | +| `persistence.persistentVolumeClaim.chartmuseum.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.chartmuseum.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.chartmuseum.size` | The size of the volume | `5Gi` | +| `persistence.persistentVolumeClaim.chartmuseum.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.chartmuseum.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.trivy.storageClass` | PVC Storage Class for Trivy data volume | `""` | +| `persistence.persistentVolumeClaim.trivy.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `5Gi` | +| `persistence.persistentVolumeClaim.trivy.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.trivy.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.imageChartStorage.caBundleSecret` | Specify the `caBundleSecret` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and chartmuseum's containers. | `""` | +| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which do not supported it (such as using MinIO® for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more information about the detail | `false` | +| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry and chartmuseum. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more information about the detail | `filesystem` | +| `persistence.imageChartStorage.filesystem.rootdirectory` | Filesystem storage type setting: Storage root directory | `/storage` | +| `persistence.imageChartStorage.filesystem.maxthreads` | Filesystem storage type setting: Maximum threads directory | `""` | +| `persistence.imageChartStorage.azure.accountname` | Azure storage type setting: Name of the Azure account | `accountname` | +| `persistence.imageChartStorage.azure.accountkey` | Azure storage type setting: Key of the Azure account | `base64encodedaccountkey` | +| `persistence.imageChartStorage.azure.container` | Azure storage type setting: Container | `containername` | +| `persistence.imageChartStorage.azure.storagePrefix` | Azure storage type setting: Storage prefix | `/azure/harbor/charts` | +| `persistence.imageChartStorage.azure.realm` | Azure storage type setting: Realm of the Azure account | `""` | +| `persistence.imageChartStorage.gcs.bucket` | GCS storage type setting: Bucket name | `bucketname` | +| `persistence.imageChartStorage.gcs.encodedkey` | GCS storage type setting: Base64 encoded key | `base64-encoded-json-key-file` | +| `persistence.imageChartStorage.gcs.rootdirectory` | GCS storage type setting: Root directory name | `""` | +| `persistence.imageChartStorage.gcs.chunksize` | GCS storage type setting: Chunk size name | `""` | +| `persistence.imageChartStorage.s3.region` | S3 storage type setting: Region | `us-west-1` | +| `persistence.imageChartStorage.s3.bucket` | S3 storage type setting: Bucket name | `bucketname` | +| `persistence.imageChartStorage.s3.accesskey` | S3 storage type setting: Access key name | `""` | +| `persistence.imageChartStorage.s3.secretkey` | S3 storage type setting: Secret Key name | `""` | +| `persistence.imageChartStorage.s3.regionendpoint` | S3 storage type setting: Region Endpoint | `""` | +| `persistence.imageChartStorage.s3.encrypt` | S3 storage type setting: Encrypt | `""` | +| `persistence.imageChartStorage.s3.keyid` | S3 storage type setting: Key ID | `""` | +| `persistence.imageChartStorage.s3.secure` | S3 storage type setting: Secure | `""` | +| `persistence.imageChartStorage.s3.skipverify` | S3 storage type setting: TLS skip verification | `""` | +| `persistence.imageChartStorage.s3.v4auth` | S3 storage type setting: V4 authorization | `""` | +| `persistence.imageChartStorage.s3.chunksize` | S3 storage type setting: V4 authorization | `""` | +| `persistence.imageChartStorage.s3.rootdirectory` | S3 storage type setting: Root directory name | `""` | +| `persistence.imageChartStorage.s3.storageClass` | S3 storage type setting: Storage class | `""` | +| `persistence.imageChartStorage.s3.sse` | S3 storage type setting: SSE name | `""` | +| `persistence.imageChartStorage.swift.authurl` | Swift storage type setting: Authentication url | `https://storage.myprovider.com/v3/auth` | +| `persistence.imageChartStorage.swift.username` | Swift storage type setting: Authentication url | `""` | +| `persistence.imageChartStorage.swift.password` | Swift storage type setting: Password | `""` | +| `persistence.imageChartStorage.swift.container` | Swift storage type setting: Container | `""` | +| `persistence.imageChartStorage.swift.region` | Swift storage type setting: Region | `""` | +| `persistence.imageChartStorage.swift.tenant` | Swift storage type setting: Tenant | `""` | +| `persistence.imageChartStorage.swift.tenantid` | Swift storage type setting: TenantID | `""` | +| `persistence.imageChartStorage.swift.domain` | Swift storage type setting: Domain | `""` | +| `persistence.imageChartStorage.swift.domainid` | Swift storage type setting: DomainID | `""` | +| `persistence.imageChartStorage.swift.trustid` | Swift storage type setting: TrustID | `""` | +| `persistence.imageChartStorage.swift.insecureskipverify` | Swift storage type setting: Verification | `""` | +| `persistence.imageChartStorage.swift.chunksize` | Swift storage type setting: Chunk | `""` | +| `persistence.imageChartStorage.swift.prefix` | Swift storage type setting: Prefix | `""` | +| `persistence.imageChartStorage.swift.secretkey` | Swift storage type setting: Secre Key | `""` | +| `persistence.imageChartStorage.swift.accesskey` | Swift storage type setting: Access Key | `""` | +| `persistence.imageChartStorage.swift.authversion` | Swift storage type setting: Auth | `""` | +| `persistence.imageChartStorage.swift.endpointtype` | Swift storage type setting: Endpoint | `""` | +| `persistence.imageChartStorage.swift.tempurlcontainerkey` | Swift storage type setting: Temp URL container key | `""` | +| `persistence.imageChartStorage.swift.tempurlmethods` | Swift storage type setting: Temp URL methods | `""` | +| `persistence.imageChartStorage.oss.accesskeyid` | OSS storage type setting: Access key ID | `""` | +| `persistence.imageChartStorage.oss.accesskeysecret` | OSS storage type setting: Access key secret name containing the token | `""` | +| `persistence.imageChartStorage.oss.region` | OSS storage type setting: Region name | `""` | +| `persistence.imageChartStorage.oss.bucket` | OSS storage type setting: Bucket name | `""` | +| `persistence.imageChartStorage.oss.endpoint` | OSS storage type setting: Endpoint | `""` | +| `persistence.imageChartStorage.oss.internal` | OSS storage type setting: Internal | `""` | +| `persistence.imageChartStorage.oss.encrypt` | OSS storage type setting: Encrypt | `""` | +| `persistence.imageChartStorage.oss.secure` | OSS storage type setting: Secure | `""` | +| `persistence.imageChartStorage.oss.chunksize` | OSS storage type setting: Chunk | `""` | +| `persistence.imageChartStorage.oss.rootdirectory` | OSS storage type setting: Directory | `""` | +| `persistence.imageChartStorage.oss.secretkey` | OSS storage type setting: Secret key | `""` | ### Tracing parameters From 43a03b41d9bec3ede578814dae172c62eb412a7e Mon Sep 17 00:00:00 2001 From: "DASTC\\gupta_rajan" Date: Thu, 29 Dec 2022 16:09:48 +0800 Subject: [PATCH 3/8] [bitnami/appsmith] Release 0.1.7 (#14118) * [bitnami/appsmith] Release 0.1.7 updating components versions Signed-off-by: Bitnami Containers * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers [bitnami/phpbb] Release 12.3.9 (#14119) * [bitnami/phpbb] Release 12.3.9 updating components versions Signed-off-by: Bitnami Containers * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers Add scandata pvc for harbor jobservice Signed-off-by: Rajan Gupta --- bitnami/appsmith/Chart.lock | 6 ++-- bitnami/appsmith/Chart.yaml | 4 +-- bitnami/appsmith/README.md | 4 +-- bitnami/appsmith/values.yaml | 4 +-- bitnami/harbor/Chart.yaml | 2 +- bitnami/harbor/README.md | 7 ++++ bitnami/harbor/templates/_helpers.tpl | 4 +++ .../templates/jobservice/jobservice-dpl.yaml | 10 ++++++ .../jobservice/jobservice-scandata-pvc.yaml | 34 +++++++++++++++++++ bitnami/harbor/values.yaml | 18 ++++++++++ bitnami/phpbb/Chart.lock | 8 ++--- bitnami/phpbb/Chart.yaml | 2 +- bitnami/phpbb/README.md | 6 ++-- bitnami/phpbb/values.yaml | 6 ++-- 14 files changed, 94 insertions(+), 21 deletions(-) create mode 100644 bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml diff --git a/bitnami/appsmith/Chart.lock b/bitnami/appsmith/Chart.lock index eae290993df7ff..2f5fac8ce54818 100644 --- a/bitnami/appsmith/Chart.lock +++ b/bitnami/appsmith/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: redis repository: https://charts.bitnami.com/bitnami - version: 17.3.17 + version: 17.4.0 - name: mongodb repository: https://charts.bitnami.com/bitnami version: 13.6.2 - name: common repository: https://charts.bitnami.com/bitnami version: 2.2.2 -digest: sha256:c0cf0b38b6a7c52824f6bf0030b16f08637185ee95f84320ae477c86dc8ee6f4 -generated: "2022-12-22T09:02:15.416809936Z" +digest: sha256:aeab736ef849682005024ae5d8f6e7f79bd47708e74fd3f98b9615674e4c7f2f +generated: "2022-12-28T17:56:10.757891476Z" diff --git a/bitnami/appsmith/Chart.yaml b/bitnami/appsmith/Chart.yaml index 5462e29954738c..93ef4cbcda6058 100644 --- a/bitnami/appsmith/Chart.yaml +++ b/bitnami/appsmith/Chart.yaml @@ -1,7 +1,7 @@ annotations: category: CMS apiVersion: v2 -appVersion: 1.8.14 +appVersion: 1.8.15 dependencies: - condition: redis.enabled name: redis @@ -30,4 +30,4 @@ name: appsmith sources: - https://github.com/bitnami/containers/tree/main/bitnami/appsmith - https://github.com/appsmithorg/appsmith/ -version: 0.1.6 +version: 0.1.7 diff --git a/bitnami/appsmith/README.md b/bitnami/appsmith/README.md index 39e016f04293c1..1bfbe60600c810 100644 --- a/bitnami/appsmith/README.md +++ b/bitnami/appsmith/README.md @@ -82,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and | `diagnosticMode.args` | Args to override all containers in the deployment | `["infinity"]` | | `image.registry` | Appsmith image registry | `docker.io` | | `image.repository` | Appsmith image repository | `bitnami/appsmith` | -| `image.tag` | Appsmith image tag (immutable tags are recommended) | `1.8.14-debian-11-r0` | +| `image.tag` | Appsmith image tag (immutable tags are recommended) | `1.8.15-debian-11-r0` | | `image.digest` | Appsmith image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""` | | `image.pullPolicy` | Appsmith image pull policy | `IfNotPresent` | | `image.pullSecrets` | Appsmith image pull secrets | `[]` | @@ -380,7 +380,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` | | `volumePermissions.image.registry` | Bitnami Shell image registry | `docker.io` | | `volumePermissions.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r64` | +| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r66` | | `volumePermissions.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | | `volumePermissions.resources.limits` | The resources limits for the init container | `{}` | diff --git a/bitnami/appsmith/values.yaml b/bitnami/appsmith/values.yaml index 00cb6d2b3fdab7..2292da1806b797 100644 --- a/bitnami/appsmith/values.yaml +++ b/bitnami/appsmith/values.yaml @@ -73,7 +73,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/appsmith - tag: 1.8.14-debian-11-r0 + tag: 1.8.15-debian-11-r0 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1114,7 +1114,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/bitnami-shell - tag: 11-debian-11-r64 + tag: 11-debian-11-r66 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/bitnami/harbor/Chart.yaml b/bitnami/harbor/Chart.yaml index 91151e41506272..93b7901fe74288 100644 --- a/bitnami/harbor/Chart.yaml +++ b/bitnami/harbor/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/harbor-registry - https://github.com/bitnami/containers/tree/main/bitnami/harbor-registryctl - https://goharbor.io/ -version: 16.1.2 +version: 16.2.0 diff --git a/bitnami/harbor/README.md b/bitnami/harbor/README.md index 757acf83923639..c95015c6ee7f0b 100644 --- a/bitnami/harbor/README.md +++ b/bitnami/harbor/README.md @@ -171,6 +171,13 @@ Additionally, if `persistence.resourcePolicy` is set to `keep`, you should manua | `persistence.persistentVolumeClaim.jobservice.size` | The size of the volume | `1Gi` | | `persistence.persistentVolumeClaim.jobservice.annotations` | Annotations for the PVC | `{}` | | `persistence.persistentVolumeClaim.jobservice.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.storageClass` | PVC Storage Class for Harbor Jobservice scan data volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.jobservice.scanData.size` | The size of the volume | `1Gi` | +| `persistence.persistentVolumeClaim.jobservice.scanData.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.selector` | Selector to match an existing Persistent Volume | `{}` | | `persistence.persistentVolumeClaim.chartmuseum.existingClaim` | Name of an existing PVC to use | `""` | | `persistence.persistentVolumeClaim.chartmuseum.storageClass` | PVC Storage Class for Chartmuseum data volume | `""` | | `persistence.persistentVolumeClaim.chartmuseum.subPath` | The sub path used in the volume | `""` | diff --git a/bitnami/harbor/templates/_helpers.tpl b/bitnami/harbor/templates/_helpers.tpl index b232b7546ca1a7..99a6fc98c8ea15 100644 --- a/bitnami/harbor/templates/_helpers.tpl +++ b/bitnami/harbor/templates/_helpers.tpl @@ -341,6 +341,10 @@ Return whether Redis® uses password authentication or not {{- printf "%s-jobservice" (include "common.names.fullname" .) -}} {{- end -}} +{{- define "harbor.jobserviceScanData" -}} + {{- printf "%s-jobservice-scandata" (include "common.names.fullname" .) -}} +{{- end -}} + {{- define "harbor.registry" -}} {{- printf "%s-registry" (include "common.names.fullname" .) -}} {{- end -}} diff --git a/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml b/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml index 0c2193aa97fe7f..bf3366c98db11b 100644 --- a/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml +++ b/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml @@ -202,6 +202,9 @@ spec: - name: job-logs mountPath: /var/log/jobs subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.subPath }} + - name: jobservice-scandata + mountPath: /var/scandata_exports + subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanData.subPath }} {{- if .Values.internalTLS.enabled }} - name: internal-tls-certs mountPath: /etc/harbor/ssl/jobservice @@ -226,6 +229,13 @@ spec: {{- else }} emptyDir: {} {{- end }} + - name: jobservice-scandata + {{- if and .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanData.existingClaim | default (include "harbor.jobserviceScanData" .) }} + {{- else }} + emptyDir: {} + {{- end }} {{- if .Values.internalTLS.caBundleSecret }} {{- include "harbor.caBundleVolume" . | nindent 8 }} {{- end }} diff --git a/bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml b/bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml new file mode 100644 index 00000000000000..70592dd7aceb71 --- /dev/null +++ b/bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml @@ -0,0 +1,34 @@ +{{- if and .Values.persistence.enabled (not .Values.persistence.persistentVolumeClaim.jobservice.scanData.existingClaim) }} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ include "harbor.jobserviceScanData" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + app.kubernetes.io/component: jobservice + annotations: + {{- if eq .Values.persistence.resourcePolicy "keep" }} + helm.sh/resource-policy: keep + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.persistence.persistentVolumeClaim.jobservice.scanData.annotations }} + {{- toYaml .Values.persistence.persistentVolumeClaim.jobservice.scanData.annotations | nindent 4 }} + {{- end }} +spec: + accessModes: + {{- range .Values.persistence.persistentVolumeClaim.jobservice.scanData.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanData.size }} + {{- if .Values.persistence.persistentVolumeClaim.jobservice.scanData.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.persistentVolumeClaim.jobservice.scanData.selector "context" $) | nindent 2 }} + {{- end }} + {{- include "common.storage.class" ( dict "persistence" .Values.persistence.persistentVolumeClaim.jobservice.scanData "global" .Values.global ) | nindent 2 }} +{{- end }} diff --git a/bitnami/harbor/values.yaml b/bitnami/harbor/values.yaml index d36cb67e499e66..816376bed31a41 100644 --- a/bitnami/harbor/values.yaml +++ b/bitnami/harbor/values.yaml @@ -462,6 +462,24 @@ persistence: size: 1Gi annotations: {} selector: {} + ## @param persistence.persistentVolumeClaim.jobservice.scanData.existingClaim Name of an existing PVC to use + ## @param persistence.persistentVolumeClaim.jobservice.scanData.storageClass PVC Storage Class for Harbor Jobservice data volume + ## Note: The default StorageClass will be used if not defined. Set it to `-` to disable dynamic provisioning + ## @param persistence.persistentVolumeClaim.jobservice.scanData.subPath The sub path used in the volume + ## @param persistence.persistentVolumeClaim.jobservice.scanData.accessModes The access mode of the volume + ## @param persistence.persistentVolumeClaim.jobservice.scanData.size The size of the volume + ## @param persistence.persistentVolumeClaim.jobservice.scanData.annotations Annotations for the PVC + ## @param persistence.persistentVolumeClaim.jobservice.scanData.selector Selector to match an existing Persistent Volume + ## + scanData: + existingClaim: "" + storageClass: "" + subPath: "" + accessModes: + - ReadWriteOnce + size: 1Gi + annotations: {} + selector: {} ## @param persistence.persistentVolumeClaim.chartmuseum.existingClaim Name of an existing PVC to use ## @param persistence.persistentVolumeClaim.chartmuseum.storageClass PVC Storage Class for Chartmuseum data volume ## Note: The default StorageClass will be used if not defined. Set it to `-` to disable dynamic provisioning diff --git a/bitnami/phpbb/Chart.lock b/bitnami/phpbb/Chart.lock index 599ea8fa99402a..ccbdabb740420d 100644 --- a/bitnami/phpbb/Chart.lock +++ b/bitnami/phpbb/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: mariadb repository: https://charts.bitnami.com/bitnami - version: 11.4.0 + version: 11.4.2 - name: common repository: https://charts.bitnami.com/bitnami - version: 2.2.1 -digest: sha256:dde669c428630bc24f807f8cb92d8f24387246afd88c591a9450d92887b880c4 -generated: "2022-11-28T22:58:59.156824119Z" + version: 2.2.2 +digest: sha256:be73e3fe8465233cf430fa16a627c39b8e0af31b76c625639c18f1aa34351a5f +generated: "2022-12-28T00:57:35.184411136Z" diff --git a/bitnami/phpbb/Chart.yaml b/bitnami/phpbb/Chart.yaml index 69ac774b92e513..fbd1927e5aac54 100644 --- a/bitnami/phpbb/Chart.yaml +++ b/bitnami/phpbb/Chart.yaml @@ -28,4 +28,4 @@ name: phpbb sources: - https://github.com/bitnami/containers/tree/main/bitnami/phpbb - https://www.phpbb.com/ -version: 12.3.8 +version: 12.3.9 diff --git a/bitnami/phpbb/README.md b/bitnami/phpbb/README.md index 2a1adce0fc6355..30fa04c50c499c 100644 --- a/bitnami/phpbb/README.md +++ b/bitnami/phpbb/README.md @@ -82,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and | --------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------- | | `image.registry` | phpBB image registry | `docker.io` | | `image.repository` | phpBB image repository | `bitnami/phpbb` | -| `image.tag` | phpBB image tag (immutable tags are recommended) | `3.3.9-debian-11-r0` | +| `image.tag` | phpBB image tag (immutable tags are recommended) | `3.3.9-debian-11-r9` | | `image.digest` | phpBB image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | phpBB image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -110,7 +110,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work) | `false` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r56` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r66` | | `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -235,7 +235,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.image.registry` | Apache exporter image registry | `docker.io` | | `metrics.image.repository` | Apache exporter image repository | `bitnami/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.11.0-debian-11-r66` | +| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.11.0-debian-11-r76` | | `metrics.image.digest` | Apache exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | diff --git a/bitnami/phpbb/values.yaml b/bitnami/phpbb/values.yaml index 905a0a6727259f..b715461509ae44 100644 --- a/bitnami/phpbb/values.yaml +++ b/bitnami/phpbb/values.yaml @@ -55,7 +55,7 @@ extraDeploy: [] image: registry: docker.io repository: bitnami/phpbb - tag: 3.3.9-debian-11-r0 + tag: 3.3.9-debian-11-r9 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -171,7 +171,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/bitnami-shell - tag: 11-debian-11-r56 + tag: 11-debian-11-r66 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -668,7 +668,7 @@ metrics: image: registry: docker.io repository: bitnami/apache-exporter - tag: 0.11.0-debian-11-r66 + tag: 0.11.0-debian-11-r76 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. From 45a7377cd82b7965f65bb853ffe9279d1e03a697 Mon Sep 17 00:00:00 2001 From: "DASTC\\gupta_rajan" Date: Thu, 29 Dec 2022 16:16:50 +0800 Subject: [PATCH 4/8] Fix README.md --- bitnami/harbor/README.md | 190 +++++++++++++++++++-------------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/bitnami/harbor/README.md b/bitnami/harbor/README.md index 7e06c6eb9d095d..1fd94554c2f95f 100644 --- a/bitnami/harbor/README.md +++ b/bitnami/harbor/README.md @@ -153,101 +153,101 @@ Additionally, if `persistence.resourcePolicy` is set to `keep`, you should manua ### Persistence Parameters -| Name | Description | Value | -| --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.registry.storageClass` | PVC Storage Class for Harbor Registry data volume | `""` | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.registry.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.registry.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.jobservice.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.jobservice.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.jobservice.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.jobservice.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.jobservice.scanData.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.jobservice.scanData.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.scanData.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.scanData.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.jobservice.scanData.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.scanData.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.jobservice.scanData.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.chartmuseum.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.chartmuseum.storageClass` | PVC Storage Class for Chartmuseum data volume | `""` | -| `persistence.persistentVolumeClaim.chartmuseum.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.chartmuseum.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.chartmuseum.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.chartmuseum.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.chartmuseum.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.trivy.storageClass` | PVC Storage Class for Trivy data volume | `""` | -| `persistence.persistentVolumeClaim.trivy.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.trivy.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.imageChartStorage.caBundleSecret` | Specify the `caBundleSecret` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and chartmuseum's containers. | `""` | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which do not supported it (such as using MinIO® for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more information about the detail | `false` | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry and chartmuseum. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more information about the detail | `filesystem` | -| `persistence.imageChartStorage.filesystem.rootdirectory` | Filesystem storage type setting: Storage root directory | `/storage` | -| `persistence.imageChartStorage.filesystem.maxthreads` | Filesystem storage type setting: Maximum threads directory | `""` | -| `persistence.imageChartStorage.azure.accountname` | Azure storage type setting: Name of the Azure account | `accountname` | -| `persistence.imageChartStorage.azure.accountkey` | Azure storage type setting: Key of the Azure account | `base64encodedaccountkey` | -| `persistence.imageChartStorage.azure.container` | Azure storage type setting: Container | `containername` | -| `persistence.imageChartStorage.azure.storagePrefix` | Azure storage type setting: Storage prefix | `/azure/harbor/charts` | -| `persistence.imageChartStorage.azure.realm` | Azure storage type setting: Realm of the Azure account | `""` | -| `persistence.imageChartStorage.gcs.bucket` | GCS storage type setting: Bucket name | `bucketname` | -| `persistence.imageChartStorage.gcs.encodedkey` | GCS storage type setting: Base64 encoded key | `base64-encoded-json-key-file` | -| `persistence.imageChartStorage.gcs.rootdirectory` | GCS storage type setting: Root directory name | `""` | -| `persistence.imageChartStorage.gcs.chunksize` | GCS storage type setting: Chunk size name | `""` | -| `persistence.imageChartStorage.s3.region` | S3 storage type setting: Region | `us-west-1` | -| `persistence.imageChartStorage.s3.bucket` | S3 storage type setting: Bucket name | `bucketname` | -| `persistence.imageChartStorage.s3.accesskey` | S3 storage type setting: Access key name | `""` | -| `persistence.imageChartStorage.s3.secretkey` | S3 storage type setting: Secret Key name | `""` | -| `persistence.imageChartStorage.s3.regionendpoint` | S3 storage type setting: Region Endpoint | `""` | -| `persistence.imageChartStorage.s3.encrypt` | S3 storage type setting: Encrypt | `""` | -| `persistence.imageChartStorage.s3.keyid` | S3 storage type setting: Key ID | `""` | -| `persistence.imageChartStorage.s3.secure` | S3 storage type setting: Secure | `""` | -| `persistence.imageChartStorage.s3.skipverify` | S3 storage type setting: TLS skip verification | `""` | -| `persistence.imageChartStorage.s3.v4auth` | S3 storage type setting: V4 authorization | `""` | -| `persistence.imageChartStorage.s3.chunksize` | S3 storage type setting: V4 authorization | `""` | -| `persistence.imageChartStorage.s3.rootdirectory` | S3 storage type setting: Root directory name | `""` | -| `persistence.imageChartStorage.s3.storageClass` | S3 storage type setting: Storage class | `""` | -| `persistence.imageChartStorage.s3.sse` | S3 storage type setting: SSE name | `""` | -| `persistence.imageChartStorage.swift.authurl` | Swift storage type setting: Authentication url | `https://storage.myprovider.com/v3/auth` | -| `persistence.imageChartStorage.swift.username` | Swift storage type setting: Authentication url | `""` | -| `persistence.imageChartStorage.swift.password` | Swift storage type setting: Password | `""` | -| `persistence.imageChartStorage.swift.container` | Swift storage type setting: Container | `""` | -| `persistence.imageChartStorage.swift.region` | Swift storage type setting: Region | `""` | -| `persistence.imageChartStorage.swift.tenant` | Swift storage type setting: Tenant | `""` | -| `persistence.imageChartStorage.swift.tenantid` | Swift storage type setting: TenantID | `""` | -| `persistence.imageChartStorage.swift.domain` | Swift storage type setting: Domain | `""` | -| `persistence.imageChartStorage.swift.domainid` | Swift storage type setting: DomainID | `""` | -| `persistence.imageChartStorage.swift.trustid` | Swift storage type setting: TrustID | `""` | -| `persistence.imageChartStorage.swift.insecureskipverify` | Swift storage type setting: Verification | `""` | -| `persistence.imageChartStorage.swift.chunksize` | Swift storage type setting: Chunk | `""` | -| `persistence.imageChartStorage.swift.prefix` | Swift storage type setting: Prefix | `""` | -| `persistence.imageChartStorage.swift.secretkey` | Swift storage type setting: Secre Key | `""` | -| `persistence.imageChartStorage.swift.accesskey` | Swift storage type setting: Access Key | `""` | -| `persistence.imageChartStorage.swift.authversion` | Swift storage type setting: Auth | `""` | -| `persistence.imageChartStorage.swift.endpointtype` | Swift storage type setting: Endpoint | `""` | -| `persistence.imageChartStorage.swift.tempurlcontainerkey` | Swift storage type setting: Temp URL container key | `""` | -| `persistence.imageChartStorage.swift.tempurlmethods` | Swift storage type setting: Temp URL methods | `""` | -| `persistence.imageChartStorage.oss.accesskeyid` | OSS storage type setting: Access key ID | `""` | -| `persistence.imageChartStorage.oss.accesskeysecret` | OSS storage type setting: Access key secret name containing the token | `""` | -| `persistence.imageChartStorage.oss.region` | OSS storage type setting: Region name | `""` | -| `persistence.imageChartStorage.oss.bucket` | OSS storage type setting: Bucket name | `""` | -| `persistence.imageChartStorage.oss.endpoint` | OSS storage type setting: Endpoint | `""` | -| `persistence.imageChartStorage.oss.internal` | OSS storage type setting: Internal | `""` | -| `persistence.imageChartStorage.oss.encrypt` | OSS storage type setting: Encrypt | `""` | -| `persistence.imageChartStorage.oss.secure` | OSS storage type setting: Secure | `""` | -| `persistence.imageChartStorage.oss.chunksize` | OSS storage type setting: Chunk | `""` | -| `persistence.imageChartStorage.oss.rootdirectory` | OSS storage type setting: Directory | `""` | -| `persistence.imageChartStorage.oss.secretkey` | OSS storage type setting: Secret key | `""` | +| Name | Description | Value | +| ------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- | +| `persistence.enabled` | Enable the data persistence or not | `true` | +| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted | `keep` | +| `persistence.persistentVolumeClaim.registry.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.registry.storageClass` | PVC Storage Class for Harbor Registry data volume | `""` | +| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.registry.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | +| `persistence.persistentVolumeClaim.registry.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.registry.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.jobservice.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.jobservice.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.jobservice.size` | The size of the volume | `1Gi` | +| `persistence.persistentVolumeClaim.jobservice.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.jobservice.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.jobservice.scanData.size` | The size of the volume | `1Gi` | +| `persistence.persistentVolumeClaim.jobservice.scanData.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.chartmuseum.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.chartmuseum.storageClass` | PVC Storage Class for Chartmuseum data volume | `""` | +| `persistence.persistentVolumeClaim.chartmuseum.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.chartmuseum.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.chartmuseum.size` | The size of the volume | `5Gi` | +| `persistence.persistentVolumeClaim.chartmuseum.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.chartmuseum.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.trivy.storageClass` | PVC Storage Class for Trivy data volume | `""` | +| `persistence.persistentVolumeClaim.trivy.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `5Gi` | +| `persistence.persistentVolumeClaim.trivy.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.trivy.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.imageChartStorage.caBundleSecret` | Specify the `caBundleSecret` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and chartmuseum's containers. | `""` | +| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which do not supported it (such as using MinIO® for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more information about the detail | `false` | +| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry and chartmuseum. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more information about the detail | `filesystem` | +| `persistence.imageChartStorage.filesystem.rootdirectory` | Filesystem storage type setting: Storage root directory | `/storage` | +| `persistence.imageChartStorage.filesystem.maxthreads` | Filesystem storage type setting: Maximum threads directory | `""` | +| `persistence.imageChartStorage.azure.accountname` | Azure storage type setting: Name of the Azure account | `accountname` | +| `persistence.imageChartStorage.azure.accountkey` | Azure storage type setting: Key of the Azure account | `base64encodedaccountkey` | +| `persistence.imageChartStorage.azure.container` | Azure storage type setting: Container | `containername` | +| `persistence.imageChartStorage.azure.storagePrefix` | Azure storage type setting: Storage prefix | `/azure/harbor/charts` | +| `persistence.imageChartStorage.azure.realm` | Azure storage type setting: Realm of the Azure account | `""` | +| `persistence.imageChartStorage.gcs.bucket` | GCS storage type setting: Bucket name | `bucketname` | +| `persistence.imageChartStorage.gcs.encodedkey` | GCS storage type setting: Base64 encoded key | `base64-encoded-json-key-file` | +| `persistence.imageChartStorage.gcs.rootdirectory` | GCS storage type setting: Root directory name | `""` | +| `persistence.imageChartStorage.gcs.chunksize` | GCS storage type setting: Chunk size name | `""` | +| `persistence.imageChartStorage.s3.region` | S3 storage type setting: Region | `us-west-1` | +| `persistence.imageChartStorage.s3.bucket` | S3 storage type setting: Bucket name | `bucketname` | +| `persistence.imageChartStorage.s3.accesskey` | S3 storage type setting: Access key name | `""` | +| `persistence.imageChartStorage.s3.secretkey` | S3 storage type setting: Secret Key name | `""` | +| `persistence.imageChartStorage.s3.regionendpoint` | S3 storage type setting: Region Endpoint | `""` | +| `persistence.imageChartStorage.s3.encrypt` | S3 storage type setting: Encrypt | `""` | +| `persistence.imageChartStorage.s3.keyid` | S3 storage type setting: Key ID | `""` | +| `persistence.imageChartStorage.s3.secure` | S3 storage type setting: Secure | `""` | +| `persistence.imageChartStorage.s3.skipverify` | S3 storage type setting: TLS skip verification | `""` | +| `persistence.imageChartStorage.s3.v4auth` | S3 storage type setting: V4 authorization | `""` | +| `persistence.imageChartStorage.s3.chunksize` | S3 storage type setting: V4 authorization | `""` | +| `persistence.imageChartStorage.s3.rootdirectory` | S3 storage type setting: Root directory name | `""` | +| `persistence.imageChartStorage.s3.storageClass` | S3 storage type setting: Storage class | `""` | +| `persistence.imageChartStorage.s3.sse` | S3 storage type setting: SSE name | `""` | +| `persistence.imageChartStorage.swift.authurl` | Swift storage type setting: Authentication url | `https://storage.myprovider.com/v3/auth` | +| `persistence.imageChartStorage.swift.username` | Swift storage type setting: Authentication url | `""` | +| `persistence.imageChartStorage.swift.password` | Swift storage type setting: Password | `""` | +| `persistence.imageChartStorage.swift.container` | Swift storage type setting: Container | `""` | +| `persistence.imageChartStorage.swift.region` | Swift storage type setting: Region | `""` | +| `persistence.imageChartStorage.swift.tenant` | Swift storage type setting: Tenant | `""` | +| `persistence.imageChartStorage.swift.tenantid` | Swift storage type setting: TenantID | `""` | +| `persistence.imageChartStorage.swift.domain` | Swift storage type setting: Domain | `""` | +| `persistence.imageChartStorage.swift.domainid` | Swift storage type setting: DomainID | `""` | +| `persistence.imageChartStorage.swift.trustid` | Swift storage type setting: TrustID | `""` | +| `persistence.imageChartStorage.swift.insecureskipverify` | Swift storage type setting: Verification | `""` | +| `persistence.imageChartStorage.swift.chunksize` | Swift storage type setting: Chunk | `""` | +| `persistence.imageChartStorage.swift.prefix` | Swift storage type setting: Prefix | `""` | +| `persistence.imageChartStorage.swift.secretkey` | Swift storage type setting: Secre Key | `""` | +| `persistence.imageChartStorage.swift.accesskey` | Swift storage type setting: Access Key | `""` | +| `persistence.imageChartStorage.swift.authversion` | Swift storage type setting: Auth | `""` | +| `persistence.imageChartStorage.swift.endpointtype` | Swift storage type setting: Endpoint | `""` | +| `persistence.imageChartStorage.swift.tempurlcontainerkey` | Swift storage type setting: Temp URL container key | `""` | +| `persistence.imageChartStorage.swift.tempurlmethods` | Swift storage type setting: Temp URL methods | `""` | +| `persistence.imageChartStorage.oss.accesskeyid` | OSS storage type setting: Access key ID | `""` | +| `persistence.imageChartStorage.oss.accesskeysecret` | OSS storage type setting: Access key secret name containing the token | `""` | +| `persistence.imageChartStorage.oss.region` | OSS storage type setting: Region name | `""` | +| `persistence.imageChartStorage.oss.bucket` | OSS storage type setting: Bucket name | `""` | +| `persistence.imageChartStorage.oss.endpoint` | OSS storage type setting: Endpoint | `""` | +| `persistence.imageChartStorage.oss.internal` | OSS storage type setting: Internal | `""` | +| `persistence.imageChartStorage.oss.encrypt` | OSS storage type setting: Encrypt | `""` | +| `persistence.imageChartStorage.oss.secure` | OSS storage type setting: Secure | `""` | +| `persistence.imageChartStorage.oss.chunksize` | OSS storage type setting: Chunk | `""` | +| `persistence.imageChartStorage.oss.rootdirectory` | OSS storage type setting: Directory | `""` | +| `persistence.imageChartStorage.oss.secretkey` | OSS storage type setting: Secret key | `""` | ### Tracing parameters From c67c809e3cdbe76def180967ea4bde56773999fd Mon Sep 17 00:00:00 2001 From: "DASTC\\gupta_rajan" Date: Thu, 29 Dec 2022 16:09:48 +0800 Subject: [PATCH 5/8] Add scandata pvc for harbor jobservice Signed-off-by: Rajan Gupta --- bitnami/appsmith/Chart.lock | 6 ++-- bitnami/appsmith/Chart.yaml | 4 +-- bitnami/appsmith/README.md | 4 +-- bitnami/appsmith/values.yaml | 4 +-- bitnami/harbor/Chart.yaml | 2 +- bitnami/harbor/README.md | 7 ++++ bitnami/harbor/templates/_helpers.tpl | 4 +++ .../templates/jobservice/jobservice-dpl.yaml | 10 ++++++ .../jobservice/jobservice-scandata-pvc.yaml | 34 +++++++++++++++++++ bitnami/harbor/values.yaml | 18 ++++++++++ bitnami/phpbb/Chart.lock | 8 ++--- bitnami/phpbb/Chart.yaml | 2 +- bitnami/phpbb/README.md | 6 ++-- bitnami/phpbb/values.yaml | 6 ++-- 14 files changed, 94 insertions(+), 21 deletions(-) create mode 100644 bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml diff --git a/bitnami/appsmith/Chart.lock b/bitnami/appsmith/Chart.lock index eae290993df7ff..2f5fac8ce54818 100644 --- a/bitnami/appsmith/Chart.lock +++ b/bitnami/appsmith/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: redis repository: https://charts.bitnami.com/bitnami - version: 17.3.17 + version: 17.4.0 - name: mongodb repository: https://charts.bitnami.com/bitnami version: 13.6.2 - name: common repository: https://charts.bitnami.com/bitnami version: 2.2.2 -digest: sha256:c0cf0b38b6a7c52824f6bf0030b16f08637185ee95f84320ae477c86dc8ee6f4 -generated: "2022-12-22T09:02:15.416809936Z" +digest: sha256:aeab736ef849682005024ae5d8f6e7f79bd47708e74fd3f98b9615674e4c7f2f +generated: "2022-12-28T17:56:10.757891476Z" diff --git a/bitnami/appsmith/Chart.yaml b/bitnami/appsmith/Chart.yaml index 5462e29954738c..93ef4cbcda6058 100644 --- a/bitnami/appsmith/Chart.yaml +++ b/bitnami/appsmith/Chart.yaml @@ -1,7 +1,7 @@ annotations: category: CMS apiVersion: v2 -appVersion: 1.8.14 +appVersion: 1.8.15 dependencies: - condition: redis.enabled name: redis @@ -30,4 +30,4 @@ name: appsmith sources: - https://github.com/bitnami/containers/tree/main/bitnami/appsmith - https://github.com/appsmithorg/appsmith/ -version: 0.1.6 +version: 0.1.7 diff --git a/bitnami/appsmith/README.md b/bitnami/appsmith/README.md index 39e016f04293c1..1bfbe60600c810 100644 --- a/bitnami/appsmith/README.md +++ b/bitnami/appsmith/README.md @@ -82,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and | `diagnosticMode.args` | Args to override all containers in the deployment | `["infinity"]` | | `image.registry` | Appsmith image registry | `docker.io` | | `image.repository` | Appsmith image repository | `bitnami/appsmith` | -| `image.tag` | Appsmith image tag (immutable tags are recommended) | `1.8.14-debian-11-r0` | +| `image.tag` | Appsmith image tag (immutable tags are recommended) | `1.8.15-debian-11-r0` | | `image.digest` | Appsmith image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""` | | `image.pullPolicy` | Appsmith image pull policy | `IfNotPresent` | | `image.pullSecrets` | Appsmith image pull secrets | `[]` | @@ -380,7 +380,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` | | `volumePermissions.image.registry` | Bitnami Shell image registry | `docker.io` | | `volumePermissions.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r64` | +| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r66` | | `volumePermissions.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | | `volumePermissions.resources.limits` | The resources limits for the init container | `{}` | diff --git a/bitnami/appsmith/values.yaml b/bitnami/appsmith/values.yaml index 00cb6d2b3fdab7..2292da1806b797 100644 --- a/bitnami/appsmith/values.yaml +++ b/bitnami/appsmith/values.yaml @@ -73,7 +73,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/appsmith - tag: 1.8.14-debian-11-r0 + tag: 1.8.15-debian-11-r0 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1114,7 +1114,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/bitnami-shell - tag: 11-debian-11-r64 + tag: 11-debian-11-r66 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/bitnami/harbor/Chart.yaml b/bitnami/harbor/Chart.yaml index 91151e41506272..93b7901fe74288 100644 --- a/bitnami/harbor/Chart.yaml +++ b/bitnami/harbor/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/harbor-registry - https://github.com/bitnami/containers/tree/main/bitnami/harbor-registryctl - https://goharbor.io/ -version: 16.1.2 +version: 16.2.0 diff --git a/bitnami/harbor/README.md b/bitnami/harbor/README.md index 757acf83923639..1fd94554c2f95f 100644 --- a/bitnami/harbor/README.md +++ b/bitnami/harbor/README.md @@ -171,6 +171,13 @@ Additionally, if `persistence.resourcePolicy` is set to `keep`, you should manua | `persistence.persistentVolumeClaim.jobservice.size` | The size of the volume | `1Gi` | | `persistence.persistentVolumeClaim.jobservice.annotations` | Annotations for the PVC | `{}` | | `persistence.persistentVolumeClaim.jobservice.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.jobservice.scanData.size` | The size of the volume | `1Gi` | +| `persistence.persistentVolumeClaim.jobservice.scanData.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.selector` | Selector to match an existing Persistent Volume | `{}` | | `persistence.persistentVolumeClaim.chartmuseum.existingClaim` | Name of an existing PVC to use | `""` | | `persistence.persistentVolumeClaim.chartmuseum.storageClass` | PVC Storage Class for Chartmuseum data volume | `""` | | `persistence.persistentVolumeClaim.chartmuseum.subPath` | The sub path used in the volume | `""` | diff --git a/bitnami/harbor/templates/_helpers.tpl b/bitnami/harbor/templates/_helpers.tpl index b232b7546ca1a7..99a6fc98c8ea15 100644 --- a/bitnami/harbor/templates/_helpers.tpl +++ b/bitnami/harbor/templates/_helpers.tpl @@ -341,6 +341,10 @@ Return whether Redis® uses password authentication or not {{- printf "%s-jobservice" (include "common.names.fullname" .) -}} {{- end -}} +{{- define "harbor.jobserviceScanData" -}} + {{- printf "%s-jobservice-scandata" (include "common.names.fullname" .) -}} +{{- end -}} + {{- define "harbor.registry" -}} {{- printf "%s-registry" (include "common.names.fullname" .) -}} {{- end -}} diff --git a/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml b/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml index 0c2193aa97fe7f..bf3366c98db11b 100644 --- a/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml +++ b/bitnami/harbor/templates/jobservice/jobservice-dpl.yaml @@ -202,6 +202,9 @@ spec: - name: job-logs mountPath: /var/log/jobs subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.subPath }} + - name: jobservice-scandata + mountPath: /var/scandata_exports + subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanData.subPath }} {{- if .Values.internalTLS.enabled }} - name: internal-tls-certs mountPath: /etc/harbor/ssl/jobservice @@ -226,6 +229,13 @@ spec: {{- else }} emptyDir: {} {{- end }} + - name: jobservice-scandata + {{- if and .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanData.existingClaim | default (include "harbor.jobserviceScanData" .) }} + {{- else }} + emptyDir: {} + {{- end }} {{- if .Values.internalTLS.caBundleSecret }} {{- include "harbor.caBundleVolume" . | nindent 8 }} {{- end }} diff --git a/bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml b/bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml new file mode 100644 index 00000000000000..70592dd7aceb71 --- /dev/null +++ b/bitnami/harbor/templates/jobservice/jobservice-scandata-pvc.yaml @@ -0,0 +1,34 @@ +{{- if and .Values.persistence.enabled (not .Values.persistence.persistentVolumeClaim.jobservice.scanData.existingClaim) }} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ include "harbor.jobserviceScanData" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + app.kubernetes.io/component: jobservice + annotations: + {{- if eq .Values.persistence.resourcePolicy "keep" }} + helm.sh/resource-policy: keep + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.persistence.persistentVolumeClaim.jobservice.scanData.annotations }} + {{- toYaml .Values.persistence.persistentVolumeClaim.jobservice.scanData.annotations | nindent 4 }} + {{- end }} +spec: + accessModes: + {{- range .Values.persistence.persistentVolumeClaim.jobservice.scanData.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanData.size }} + {{- if .Values.persistence.persistentVolumeClaim.jobservice.scanData.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.persistentVolumeClaim.jobservice.scanData.selector "context" $) | nindent 2 }} + {{- end }} + {{- include "common.storage.class" ( dict "persistence" .Values.persistence.persistentVolumeClaim.jobservice.scanData "global" .Values.global ) | nindent 2 }} +{{- end }} diff --git a/bitnami/harbor/values.yaml b/bitnami/harbor/values.yaml index d36cb67e499e66..816376bed31a41 100644 --- a/bitnami/harbor/values.yaml +++ b/bitnami/harbor/values.yaml @@ -462,6 +462,24 @@ persistence: size: 1Gi annotations: {} selector: {} + ## @param persistence.persistentVolumeClaim.jobservice.scanData.existingClaim Name of an existing PVC to use + ## @param persistence.persistentVolumeClaim.jobservice.scanData.storageClass PVC Storage Class for Harbor Jobservice data volume + ## Note: The default StorageClass will be used if not defined. Set it to `-` to disable dynamic provisioning + ## @param persistence.persistentVolumeClaim.jobservice.scanData.subPath The sub path used in the volume + ## @param persistence.persistentVolumeClaim.jobservice.scanData.accessModes The access mode of the volume + ## @param persistence.persistentVolumeClaim.jobservice.scanData.size The size of the volume + ## @param persistence.persistentVolumeClaim.jobservice.scanData.annotations Annotations for the PVC + ## @param persistence.persistentVolumeClaim.jobservice.scanData.selector Selector to match an existing Persistent Volume + ## + scanData: + existingClaim: "" + storageClass: "" + subPath: "" + accessModes: + - ReadWriteOnce + size: 1Gi + annotations: {} + selector: {} ## @param persistence.persistentVolumeClaim.chartmuseum.existingClaim Name of an existing PVC to use ## @param persistence.persistentVolumeClaim.chartmuseum.storageClass PVC Storage Class for Chartmuseum data volume ## Note: The default StorageClass will be used if not defined. Set it to `-` to disable dynamic provisioning diff --git a/bitnami/phpbb/Chart.lock b/bitnami/phpbb/Chart.lock index 599ea8fa99402a..ccbdabb740420d 100644 --- a/bitnami/phpbb/Chart.lock +++ b/bitnami/phpbb/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: mariadb repository: https://charts.bitnami.com/bitnami - version: 11.4.0 + version: 11.4.2 - name: common repository: https://charts.bitnami.com/bitnami - version: 2.2.1 -digest: sha256:dde669c428630bc24f807f8cb92d8f24387246afd88c591a9450d92887b880c4 -generated: "2022-11-28T22:58:59.156824119Z" + version: 2.2.2 +digest: sha256:be73e3fe8465233cf430fa16a627c39b8e0af31b76c625639c18f1aa34351a5f +generated: "2022-12-28T00:57:35.184411136Z" diff --git a/bitnami/phpbb/Chart.yaml b/bitnami/phpbb/Chart.yaml index 69ac774b92e513..fbd1927e5aac54 100644 --- a/bitnami/phpbb/Chart.yaml +++ b/bitnami/phpbb/Chart.yaml @@ -28,4 +28,4 @@ name: phpbb sources: - https://github.com/bitnami/containers/tree/main/bitnami/phpbb - https://www.phpbb.com/ -version: 12.3.8 +version: 12.3.9 diff --git a/bitnami/phpbb/README.md b/bitnami/phpbb/README.md index 2a1adce0fc6355..30fa04c50c499c 100644 --- a/bitnami/phpbb/README.md +++ b/bitnami/phpbb/README.md @@ -82,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and | --------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------- | | `image.registry` | phpBB image registry | `docker.io` | | `image.repository` | phpBB image repository | `bitnami/phpbb` | -| `image.tag` | phpBB image tag (immutable tags are recommended) | `3.3.9-debian-11-r0` | +| `image.tag` | phpBB image tag (immutable tags are recommended) | `3.3.9-debian-11-r9` | | `image.digest` | phpBB image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | phpBB image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -110,7 +110,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work) | `false` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r56` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r66` | | `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -235,7 +235,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.image.registry` | Apache exporter image registry | `docker.io` | | `metrics.image.repository` | Apache exporter image repository | `bitnami/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.11.0-debian-11-r66` | +| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.11.0-debian-11-r76` | | `metrics.image.digest` | Apache exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | diff --git a/bitnami/phpbb/values.yaml b/bitnami/phpbb/values.yaml index 905a0a6727259f..b715461509ae44 100644 --- a/bitnami/phpbb/values.yaml +++ b/bitnami/phpbb/values.yaml @@ -55,7 +55,7 @@ extraDeploy: [] image: registry: docker.io repository: bitnami/phpbb - tag: 3.3.9-debian-11-r0 + tag: 3.3.9-debian-11-r9 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -171,7 +171,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/bitnami-shell - tag: 11-debian-11-r56 + tag: 11-debian-11-r66 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -668,7 +668,7 @@ metrics: image: registry: docker.io repository: bitnami/apache-exporter - tag: 0.11.0-debian-11-r66 + tag: 0.11.0-debian-11-r76 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. From 03e397e1d867191cccdb5c6c303e66a6dd8a3708 Mon Sep 17 00:00:00 2001 From: "DASTC\\gupta_rajan" Date: Thu, 29 Dec 2022 16:25:45 +0800 Subject: [PATCH 6/8] Revert Chart.yaml --- bitnami/harbor/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/harbor/Chart.yaml b/bitnami/harbor/Chart.yaml index 93b7901fe74288..91151e41506272 100644 --- a/bitnami/harbor/Chart.yaml +++ b/bitnami/harbor/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/harbor-registry - https://github.com/bitnami/containers/tree/main/bitnami/harbor-registryctl - https://goharbor.io/ -version: 16.2.0 +version: 16.1.2 From ed80f40d65bd83ebc8afec4dc407f80af31dee97 Mon Sep 17 00:00:00 2001 From: Rajan Gupta Date: Thu, 29 Dec 2022 16:31:21 +0800 Subject: [PATCH 7/8] Bump chart to 16.2.0 Signed-off-by: DASTC\gupta_rajan --- bitnami/harbor/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/harbor/Chart.yaml b/bitnami/harbor/Chart.yaml index 91151e41506272..93b7901fe74288 100644 --- a/bitnami/harbor/Chart.yaml +++ b/bitnami/harbor/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/harbor-registry - https://github.com/bitnami/containers/tree/main/bitnami/harbor-registryctl - https://goharbor.io/ -version: 16.1.2 +version: 16.2.0 From 83cd9e6197129dd46526d25607ee120569107b5d Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Thu, 29 Dec 2022 08:33:28 +0000 Subject: [PATCH 8/8] Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --- bitnami/harbor/README.md | 190 +++++++++++++++++++-------------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/bitnami/harbor/README.md b/bitnami/harbor/README.md index 1fd94554c2f95f..7e06c6eb9d095d 100644 --- a/bitnami/harbor/README.md +++ b/bitnami/harbor/README.md @@ -153,101 +153,101 @@ Additionally, if `persistence.resourcePolicy` is set to `keep`, you should manua ### Persistence Parameters -| Name | Description | Value | -| ------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.registry.storageClass` | PVC Storage Class for Harbor Registry data volume | `""` | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.registry.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.registry.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.jobservice.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.jobservice.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.jobservice.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.jobservice.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.jobservice.scanData.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.jobservice.scanData.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.scanData.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.jobservice.scanData.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.jobservice.scanData.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.scanData.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.jobservice.scanData.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.chartmuseum.existingClaim` | Name of an existing PVC to use | `""` | -| `persistence.persistentVolumeClaim.chartmuseum.storageClass` | PVC Storage Class for Chartmuseum data volume | `""` | -| `persistence.persistentVolumeClaim.chartmuseum.subPath` | The sub path used in the volume | `""` | -| `persistence.persistentVolumeClaim.chartmuseum.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.chartmuseum.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.chartmuseum.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.chartmuseum.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.persistentVolumeClaim.trivy.storageClass` | PVC Storage Class for Trivy data volume | `""` | -| `persistence.persistentVolumeClaim.trivy.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | Annotations for the PVC | `{}` | -| `persistence.persistentVolumeClaim.trivy.selector` | Selector to match an existing Persistent Volume | `{}` | -| `persistence.imageChartStorage.caBundleSecret` | Specify the `caBundleSecret` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and chartmuseum's containers. | `""` | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which do not supported it (such as using MinIO® for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more information about the detail | `false` | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry and chartmuseum. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more information about the detail | `filesystem` | -| `persistence.imageChartStorage.filesystem.rootdirectory` | Filesystem storage type setting: Storage root directory | `/storage` | -| `persistence.imageChartStorage.filesystem.maxthreads` | Filesystem storage type setting: Maximum threads directory | `""` | -| `persistence.imageChartStorage.azure.accountname` | Azure storage type setting: Name of the Azure account | `accountname` | -| `persistence.imageChartStorage.azure.accountkey` | Azure storage type setting: Key of the Azure account | `base64encodedaccountkey` | -| `persistence.imageChartStorage.azure.container` | Azure storage type setting: Container | `containername` | -| `persistence.imageChartStorage.azure.storagePrefix` | Azure storage type setting: Storage prefix | `/azure/harbor/charts` | -| `persistence.imageChartStorage.azure.realm` | Azure storage type setting: Realm of the Azure account | `""` | -| `persistence.imageChartStorage.gcs.bucket` | GCS storage type setting: Bucket name | `bucketname` | -| `persistence.imageChartStorage.gcs.encodedkey` | GCS storage type setting: Base64 encoded key | `base64-encoded-json-key-file` | -| `persistence.imageChartStorage.gcs.rootdirectory` | GCS storage type setting: Root directory name | `""` | -| `persistence.imageChartStorage.gcs.chunksize` | GCS storage type setting: Chunk size name | `""` | -| `persistence.imageChartStorage.s3.region` | S3 storage type setting: Region | `us-west-1` | -| `persistence.imageChartStorage.s3.bucket` | S3 storage type setting: Bucket name | `bucketname` | -| `persistence.imageChartStorage.s3.accesskey` | S3 storage type setting: Access key name | `""` | -| `persistence.imageChartStorage.s3.secretkey` | S3 storage type setting: Secret Key name | `""` | -| `persistence.imageChartStorage.s3.regionendpoint` | S3 storage type setting: Region Endpoint | `""` | -| `persistence.imageChartStorage.s3.encrypt` | S3 storage type setting: Encrypt | `""` | -| `persistence.imageChartStorage.s3.keyid` | S3 storage type setting: Key ID | `""` | -| `persistence.imageChartStorage.s3.secure` | S3 storage type setting: Secure | `""` | -| `persistence.imageChartStorage.s3.skipverify` | S3 storage type setting: TLS skip verification | `""` | -| `persistence.imageChartStorage.s3.v4auth` | S3 storage type setting: V4 authorization | `""` | -| `persistence.imageChartStorage.s3.chunksize` | S3 storage type setting: V4 authorization | `""` | -| `persistence.imageChartStorage.s3.rootdirectory` | S3 storage type setting: Root directory name | `""` | -| `persistence.imageChartStorage.s3.storageClass` | S3 storage type setting: Storage class | `""` | -| `persistence.imageChartStorage.s3.sse` | S3 storage type setting: SSE name | `""` | -| `persistence.imageChartStorage.swift.authurl` | Swift storage type setting: Authentication url | `https://storage.myprovider.com/v3/auth` | -| `persistence.imageChartStorage.swift.username` | Swift storage type setting: Authentication url | `""` | -| `persistence.imageChartStorage.swift.password` | Swift storage type setting: Password | `""` | -| `persistence.imageChartStorage.swift.container` | Swift storage type setting: Container | `""` | -| `persistence.imageChartStorage.swift.region` | Swift storage type setting: Region | `""` | -| `persistence.imageChartStorage.swift.tenant` | Swift storage type setting: Tenant | `""` | -| `persistence.imageChartStorage.swift.tenantid` | Swift storage type setting: TenantID | `""` | -| `persistence.imageChartStorage.swift.domain` | Swift storage type setting: Domain | `""` | -| `persistence.imageChartStorage.swift.domainid` | Swift storage type setting: DomainID | `""` | -| `persistence.imageChartStorage.swift.trustid` | Swift storage type setting: TrustID | `""` | -| `persistence.imageChartStorage.swift.insecureskipverify` | Swift storage type setting: Verification | `""` | -| `persistence.imageChartStorage.swift.chunksize` | Swift storage type setting: Chunk | `""` | -| `persistence.imageChartStorage.swift.prefix` | Swift storage type setting: Prefix | `""` | -| `persistence.imageChartStorage.swift.secretkey` | Swift storage type setting: Secre Key | `""` | -| `persistence.imageChartStorage.swift.accesskey` | Swift storage type setting: Access Key | `""` | -| `persistence.imageChartStorage.swift.authversion` | Swift storage type setting: Auth | `""` | -| `persistence.imageChartStorage.swift.endpointtype` | Swift storage type setting: Endpoint | `""` | -| `persistence.imageChartStorage.swift.tempurlcontainerkey` | Swift storage type setting: Temp URL container key | `""` | -| `persistence.imageChartStorage.swift.tempurlmethods` | Swift storage type setting: Temp URL methods | `""` | -| `persistence.imageChartStorage.oss.accesskeyid` | OSS storage type setting: Access key ID | `""` | -| `persistence.imageChartStorage.oss.accesskeysecret` | OSS storage type setting: Access key secret name containing the token | `""` | -| `persistence.imageChartStorage.oss.region` | OSS storage type setting: Region name | `""` | -| `persistence.imageChartStorage.oss.bucket` | OSS storage type setting: Bucket name | `""` | -| `persistence.imageChartStorage.oss.endpoint` | OSS storage type setting: Endpoint | `""` | -| `persistence.imageChartStorage.oss.internal` | OSS storage type setting: Internal | `""` | -| `persistence.imageChartStorage.oss.encrypt` | OSS storage type setting: Encrypt | `""` | -| `persistence.imageChartStorage.oss.secure` | OSS storage type setting: Secure | `""` | -| `persistence.imageChartStorage.oss.chunksize` | OSS storage type setting: Chunk | `""` | -| `persistence.imageChartStorage.oss.rootdirectory` | OSS storage type setting: Directory | `""` | -| `persistence.imageChartStorage.oss.secretkey` | OSS storage type setting: Secret key | `""` | +| Name | Description | Value | +| --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- | +| `persistence.enabled` | Enable the data persistence or not | `true` | +| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted | `keep` | +| `persistence.persistentVolumeClaim.registry.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.registry.storageClass` | PVC Storage Class for Harbor Registry data volume | `""` | +| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.registry.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | +| `persistence.persistentVolumeClaim.registry.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.registry.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.jobservice.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.jobservice.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.jobservice.size` | The size of the volume | `1Gi` | +| `persistence.persistentVolumeClaim.jobservice.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.jobservice.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.storageClass` | PVC Storage Class for Harbor Jobservice data volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.jobservice.scanData.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.jobservice.scanData.size` | The size of the volume | `1Gi` | +| `persistence.persistentVolumeClaim.jobservice.scanData.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.jobservice.scanData.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.chartmuseum.existingClaim` | Name of an existing PVC to use | `""` | +| `persistence.persistentVolumeClaim.chartmuseum.storageClass` | PVC Storage Class for Chartmuseum data volume | `""` | +| `persistence.persistentVolumeClaim.chartmuseum.subPath` | The sub path used in the volume | `""` | +| `persistence.persistentVolumeClaim.chartmuseum.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.chartmuseum.size` | The size of the volume | `5Gi` | +| `persistence.persistentVolumeClaim.chartmuseum.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.chartmuseum.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.persistentVolumeClaim.trivy.storageClass` | PVC Storage Class for Trivy data volume | `""` | +| `persistence.persistentVolumeClaim.trivy.accessModes` | The access mode of the volume | `["ReadWriteOnce"]` | +| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `5Gi` | +| `persistence.persistentVolumeClaim.trivy.annotations` | Annotations for the PVC | `{}` | +| `persistence.persistentVolumeClaim.trivy.selector` | Selector to match an existing Persistent Volume | `{}` | +| `persistence.imageChartStorage.caBundleSecret` | Specify the `caBundleSecret` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and chartmuseum's containers. | `""` | +| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which do not supported it (such as using MinIO® for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more information about the detail | `false` | +| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry and chartmuseum. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more information about the detail | `filesystem` | +| `persistence.imageChartStorage.filesystem.rootdirectory` | Filesystem storage type setting: Storage root directory | `/storage` | +| `persistence.imageChartStorage.filesystem.maxthreads` | Filesystem storage type setting: Maximum threads directory | `""` | +| `persistence.imageChartStorage.azure.accountname` | Azure storage type setting: Name of the Azure account | `accountname` | +| `persistence.imageChartStorage.azure.accountkey` | Azure storage type setting: Key of the Azure account | `base64encodedaccountkey` | +| `persistence.imageChartStorage.azure.container` | Azure storage type setting: Container | `containername` | +| `persistence.imageChartStorage.azure.storagePrefix` | Azure storage type setting: Storage prefix | `/azure/harbor/charts` | +| `persistence.imageChartStorage.azure.realm` | Azure storage type setting: Realm of the Azure account | `""` | +| `persistence.imageChartStorage.gcs.bucket` | GCS storage type setting: Bucket name | `bucketname` | +| `persistence.imageChartStorage.gcs.encodedkey` | GCS storage type setting: Base64 encoded key | `base64-encoded-json-key-file` | +| `persistence.imageChartStorage.gcs.rootdirectory` | GCS storage type setting: Root directory name | `""` | +| `persistence.imageChartStorage.gcs.chunksize` | GCS storage type setting: Chunk size name | `""` | +| `persistence.imageChartStorage.s3.region` | S3 storage type setting: Region | `us-west-1` | +| `persistence.imageChartStorage.s3.bucket` | S3 storage type setting: Bucket name | `bucketname` | +| `persistence.imageChartStorage.s3.accesskey` | S3 storage type setting: Access key name | `""` | +| `persistence.imageChartStorage.s3.secretkey` | S3 storage type setting: Secret Key name | `""` | +| `persistence.imageChartStorage.s3.regionendpoint` | S3 storage type setting: Region Endpoint | `""` | +| `persistence.imageChartStorage.s3.encrypt` | S3 storage type setting: Encrypt | `""` | +| `persistence.imageChartStorage.s3.keyid` | S3 storage type setting: Key ID | `""` | +| `persistence.imageChartStorage.s3.secure` | S3 storage type setting: Secure | `""` | +| `persistence.imageChartStorage.s3.skipverify` | S3 storage type setting: TLS skip verification | `""` | +| `persistence.imageChartStorage.s3.v4auth` | S3 storage type setting: V4 authorization | `""` | +| `persistence.imageChartStorage.s3.chunksize` | S3 storage type setting: V4 authorization | `""` | +| `persistence.imageChartStorage.s3.rootdirectory` | S3 storage type setting: Root directory name | `""` | +| `persistence.imageChartStorage.s3.storageClass` | S3 storage type setting: Storage class | `""` | +| `persistence.imageChartStorage.s3.sse` | S3 storage type setting: SSE name | `""` | +| `persistence.imageChartStorage.swift.authurl` | Swift storage type setting: Authentication url | `https://storage.myprovider.com/v3/auth` | +| `persistence.imageChartStorage.swift.username` | Swift storage type setting: Authentication url | `""` | +| `persistence.imageChartStorage.swift.password` | Swift storage type setting: Password | `""` | +| `persistence.imageChartStorage.swift.container` | Swift storage type setting: Container | `""` | +| `persistence.imageChartStorage.swift.region` | Swift storage type setting: Region | `""` | +| `persistence.imageChartStorage.swift.tenant` | Swift storage type setting: Tenant | `""` | +| `persistence.imageChartStorage.swift.tenantid` | Swift storage type setting: TenantID | `""` | +| `persistence.imageChartStorage.swift.domain` | Swift storage type setting: Domain | `""` | +| `persistence.imageChartStorage.swift.domainid` | Swift storage type setting: DomainID | `""` | +| `persistence.imageChartStorage.swift.trustid` | Swift storage type setting: TrustID | `""` | +| `persistence.imageChartStorage.swift.insecureskipverify` | Swift storage type setting: Verification | `""` | +| `persistence.imageChartStorage.swift.chunksize` | Swift storage type setting: Chunk | `""` | +| `persistence.imageChartStorage.swift.prefix` | Swift storage type setting: Prefix | `""` | +| `persistence.imageChartStorage.swift.secretkey` | Swift storage type setting: Secre Key | `""` | +| `persistence.imageChartStorage.swift.accesskey` | Swift storage type setting: Access Key | `""` | +| `persistence.imageChartStorage.swift.authversion` | Swift storage type setting: Auth | `""` | +| `persistence.imageChartStorage.swift.endpointtype` | Swift storage type setting: Endpoint | `""` | +| `persistence.imageChartStorage.swift.tempurlcontainerkey` | Swift storage type setting: Temp URL container key | `""` | +| `persistence.imageChartStorage.swift.tempurlmethods` | Swift storage type setting: Temp URL methods | `""` | +| `persistence.imageChartStorage.oss.accesskeyid` | OSS storage type setting: Access key ID | `""` | +| `persistence.imageChartStorage.oss.accesskeysecret` | OSS storage type setting: Access key secret name containing the token | `""` | +| `persistence.imageChartStorage.oss.region` | OSS storage type setting: Region name | `""` | +| `persistence.imageChartStorage.oss.bucket` | OSS storage type setting: Bucket name | `""` | +| `persistence.imageChartStorage.oss.endpoint` | OSS storage type setting: Endpoint | `""` | +| `persistence.imageChartStorage.oss.internal` | OSS storage type setting: Internal | `""` | +| `persistence.imageChartStorage.oss.encrypt` | OSS storage type setting: Encrypt | `""` | +| `persistence.imageChartStorage.oss.secure` | OSS storage type setting: Secure | `""` | +| `persistence.imageChartStorage.oss.chunksize` | OSS storage type setting: Chunk | `""` | +| `persistence.imageChartStorage.oss.rootdirectory` | OSS storage type setting: Directory | `""` | +| `persistence.imageChartStorage.oss.secretkey` | OSS storage type setting: Secret key | `""` | ### Tracing parameters