From bcfb18ee602abbd5d53fbe18492287bfcd9037ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?= Date: Mon, 22 Aug 2022 18:09:26 +0200 Subject: [PATCH] [bitnami/matomo] Add support for image digest apart from tag (#11920) * [bitnami/matomo] Add support for image digest apart from tag Signed-off-by: Carlos Rodriguez Hernandez * Update Chart.lock Signed-off-by: Carlos Rodriguez Hernandez * Update Chart.lock Signed-off-by: Carlos Rodriguez Hernandez * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers Signed-off-by: Carlos Rodriguez Hernandez Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/matomo/Chart.lock | 8 ++--- bitnami/matomo/Chart.yaml | 4 +-- bitnami/matomo/README.md | 62 ++++++++++++++++++++------------------ bitnami/matomo/values.yaml | 8 +++++ 4 files changed, 47 insertions(+), 35 deletions(-) diff --git a/bitnami/matomo/Chart.lock b/bitnami/matomo/Chart.lock index b0f6120ccf..0cc44d86c9 100644 --- a/bitnami/matomo/Chart.lock +++ b/bitnami/matomo/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: mariadb repository: https://charts.bitnami.com/bitnami - version: 11.1.3 + version: 11.2.0 - name: common repository: https://charts.bitnami.com/bitnami - version: 1.16.1 -digest: sha256:ecc82c66a806f9a40e172ff4dd565672bc8becce4e2a401920aa695230739b51 -generated: "2022-08-02T16:24:11.544808018Z" + version: 2.0.0 +digest: sha256:f42928c69e683d72cf3b7f57e2108f1ba8222fa3b44cbcd1376ded4e8f1c3ba4 +generated: "2022-08-22T14:26:11.378671914Z" diff --git a/bitnami/matomo/Chart.yaml b/bitnami/matomo/Chart.yaml index a02277acf1..0cdf0d5a0f 100644 --- a/bitnami/matomo/Chart.yaml +++ b/bitnami/matomo/Chart.yaml @@ -11,7 +11,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami tags: - bitnami-common - version: 1.x.x + version: 2.x.x description: Matomo, formerly known as Piwik, is a real time web analytics program. It provides detailed reports on website visitors. engine: gotpl home: https://github.com/bitnami/charts/tree/master/bitnami/matomo @@ -30,4 +30,4 @@ name: matomo sources: - https://github.com/bitnami/containers/tree/main/bitnami/matomo - https://www.matomo.org/ -version: 0.1.4 +version: 0.2.0 diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md index 42b27000f0..bfe4efe451 100644 --- a/bitnami/matomo/README.md +++ b/bitnami/matomo/README.md @@ -83,6 +83,7 @@ The command removes all the Kubernetes components associated with the chart and | `image.registry` | Matomo image registry | `docker.io` | | `image.repository` | Matomo Image name | `bitnami/matomo` | | `image.tag` | Matomo Image tag | `4.10.1-debian-11-r22` | +| `image.digest` | Matomo image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | Matomo image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | | `image.debug` | Specify if debug logs should be enabled | `false` | @@ -234,6 +235,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image name | `bitnami/bitnami-shell` | | `volumePermissions.image.tag` | Init container volume-permissions image tag | `11-debian-11-r21` | +| `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 | `[]` | | `volumePermissions.resources.limits` | The resources limits for the container | `{}` | @@ -242,39 +244,41 @@ The command removes all the Kubernetes components associated with the chart and ### Metrics parameters -| Name | Description | Value | -| --------------------------- | ------------------------------------------------ | ------------------------- | -| `metrics.enabled` | Start a exporter side-car | `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 | `0.11.0-debian-11-r24` | -| `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | -| `metrics.resources` | Metrics exporter resource requests and limits | `{}` | -| `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{}` | +| Name | Description | Value | +| --------------------------- | --------------------------------------------------------------------------------------------------------------- | ------------------------- | +| `metrics.enabled` | Start a exporter side-car | `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 | `0.11.0-debian-11-r24` | +| `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 | `[]` | +| `metrics.resources` | Metrics exporter resource requests and limits | `{}` | +| `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{}` | ### Certificate injection parameters -| Name | Description | Value | -| ---------------------------------------------------- | -------------------------------------------------------------------- | ---------------------------------------- | -| `certificates.customCertificate.certificateSecret` | Secret containing the certificate and key to add | `""` | -| `certificates.customCertificate.chainSecret.name` | Name of the secret containing the certificate chain | `secret-name` | -| `certificates.customCertificate.chainSecret.key` | Key of the certificate chain file inside the secret | `secret-key` | -| `certificates.customCertificate.certificateLocation` | Location in the container to store the certificate | `/etc/ssl/certs/ssl-cert-snakeoil.pem` | -| `certificates.customCertificate.keyLocation` | Location in the container to store the private key | `/etc/ssl/private/ssl-cert-snakeoil.key` | -| `certificates.customCertificate.chainLocation` | Location in the container to store the certificate chain | `/etc/ssl/certs/mychain.pem` | -| `certificates.customCAs` | Defines a list of secrets to import into the container trust store | `[]` | -| `certificates.command` | Override default container command (useful when using custom images) | `[]` | -| `certificates.args` | Override default container args (useful when using custom images) | `[]` | -| `certificates.extraEnvVars` | Container sidecar extra environment variables (eg proxy) | `[]` | -| `certificates.extraEnvVarsCM` | ConfigMap containing extra env vars | `""` | -| `certificates.extraEnvVarsSecret` | Secret containing extra env vars (in case of sensitive data) | `""` | -| `certificates.image.registry` | Container sidecar registry | `docker.io` | -| `certificates.image.repository` | Container sidecar image | `bitnami/bitnami-shell` | -| `certificates.image.tag` | Container sidecar image tag | `11-debian-11-r21` | -| `certificates.image.pullPolicy` | Container sidecar image pull policy | `IfNotPresent` | -| `certificates.image.pullSecrets` | Container sidecar image pull secrets | `[]` | +| Name | Description | Value | +| ---------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------- | +| `certificates.customCertificate.certificateSecret` | Secret containing the certificate and key to add | `""` | +| `certificates.customCertificate.chainSecret.name` | Name of the secret containing the certificate chain | `secret-name` | +| `certificates.customCertificate.chainSecret.key` | Key of the certificate chain file inside the secret | `secret-key` | +| `certificates.customCertificate.certificateLocation` | Location in the container to store the certificate | `/etc/ssl/certs/ssl-cert-snakeoil.pem` | +| `certificates.customCertificate.keyLocation` | Location in the container to store the private key | `/etc/ssl/private/ssl-cert-snakeoil.key` | +| `certificates.customCertificate.chainLocation` | Location in the container to store the certificate chain | `/etc/ssl/certs/mychain.pem` | +| `certificates.customCAs` | Defines a list of secrets to import into the container trust store | `[]` | +| `certificates.command` | Override default container command (useful when using custom images) | `[]` | +| `certificates.args` | Override default container args (useful when using custom images) | `[]` | +| `certificates.extraEnvVars` | Container sidecar extra environment variables (eg proxy) | `[]` | +| `certificates.extraEnvVarsCM` | ConfigMap containing extra env vars | `""` | +| `certificates.extraEnvVarsSecret` | Secret containing extra env vars (in case of sensitive data) | `""` | +| `certificates.image.registry` | Container sidecar registry | `docker.io` | +| `certificates.image.repository` | Container sidecar image | `bitnami/bitnami-shell` | +| `certificates.image.tag` | Container sidecar image tag | `11-debian-11-r21` | +| `certificates.image.digest` | Container sidecar image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `certificates.image.pullPolicy` | Container sidecar image pull policy | `IfNotPresent` | +| `certificates.image.pullSecrets` | Container sidecar image pull secrets | `[]` | ### NetworkPolicy parameters diff --git a/bitnami/matomo/values.yaml b/bitnami/matomo/values.yaml index 2f8aa748ed..aac7397f03 100644 --- a/bitnami/matomo/values.yaml +++ b/bitnami/matomo/values.yaml @@ -51,6 +51,7 @@ extraDeploy: [] ## @param image.registry Matomo image registry ## @param image.repository Matomo Image name ## @param image.tag Matomo Image tag +## @param image.digest Matomo image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag ## @param image.pullPolicy Matomo image pull policy ## @param image.pullSecrets Specify docker-registry secret names as an array ## @param image.debug Specify if debug logs should be enabled @@ -59,6 +60,7 @@ image: registry: docker.io repository: bitnami/matomo tag: 4.10.1-debian-11-r22 + digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -655,6 +657,7 @@ volumePermissions: ## @param volumePermissions.image.registry Init container volume-permissions image registry ## @param volumePermissions.image.repository Init container volume-permissions image name ## @param volumePermissions.image.tag Init container volume-permissions image tag + ## @param volumePermissions.image.digest Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag ## @param volumePermissions.image.pullPolicy Init container volume-permissions image pull policy ## @param volumePermissions.image.pullSecrets Specify docker-registry secret names as an array ## @@ -662,6 +665,7 @@ volumePermissions: registry: docker.io repository: bitnami/bitnami-shell tag: 11-debian-11-r21 + digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -706,6 +710,7 @@ metrics: ## @param metrics.image.registry Apache exporter image registry ## @param metrics.image.repository Apache exporter image repository ## @param metrics.image.tag Apache exporter image tag + ## @param metrics.image.digest Apache exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag ## @param metrics.image.pullPolicy Image pull policy ## @param metrics.image.pullSecrets Specify docker-registry secret names as an array ## @@ -713,6 +718,7 @@ metrics: registry: docker.io repository: bitnami/apache-exporter tag: 0.11.0-debian-11-r24 + digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -775,6 +781,7 @@ certificates: ## @param certificates.image.registry Container sidecar registry ## @param certificates.image.repository Container sidecar image ## @param certificates.image.tag Container sidecar image tag + ## @param certificates.image.digest Container sidecar image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag ## @param certificates.image.pullPolicy Container sidecar image pull policy ## @param certificates.image.pullSecrets Container sidecar image pull secrets ## @@ -782,6 +789,7 @@ certificates: registry: docker.io repository: bitnami/bitnami-shell tag: 11-debian-11-r21 + digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images