From 8b9e69d51bdf59b1178afe640f80b6a45954df53 Mon Sep 17 00:00:00 2001 From: Ween Jiann <16207788+lwj5@users.noreply.github.com> Date: Thu, 8 Jul 2021 02:11:39 +0800 Subject: [PATCH] Updated Redis chart dependencies (#372) * Updated chart dependencies * Change redis password flag --- charts/invoiceninja/Chart.lock | 8 +++---- charts/invoiceninja/Chart.yaml | 4 ++-- charts/invoiceninja/README.md | 21 +++++++++++-------- charts/invoiceninja/templates/deployment.yaml | 2 +- charts/invoiceninja/values.yaml | 3 ++- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/charts/invoiceninja/Chart.lock b/charts/invoiceninja/Chart.lock index 798d3e9..4426c7e 100644 --- a/charts/invoiceninja/Chart.lock +++ b/charts/invoiceninja/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 1.7.0 - name: nginx repository: https://charts.bitnami.com/bitnami - version: 9.3.5 + version: 9.3.6 - name: mariadb repository: https://charts.bitnami.com/bitnami version: 9.3.16 - name: redis repository: https://charts.bitnami.com/bitnami - version: 12.10.1 -digest: sha256:d5605fef85b764ec25c0a486df1228f0d7946a3e029d361514d3582b779cbce6 -generated: "2021-07-07T02:14:37.758095+08:00" + version: 14.6.6 +digest: sha256:675a7e41183e23844b8c3c589e25c2fafccd394cd03710e0a2b35d72db436d70 +generated: "2021-07-08T00:30:57.000141+08:00" diff --git a/charts/invoiceninja/Chart.yaml b/charts/invoiceninja/Chart.yaml index ae3d2dd..801ab59 100644 --- a/charts/invoiceninja/Chart.yaml +++ b/charts/invoiceninja/Chart.yaml @@ -13,7 +13,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.0 +version: 0.7.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. @@ -40,7 +40,7 @@ dependencies: - condition: redis.enabled name: redis repository: https://charts.bitnami.com/bitnami - version: 12.x.x + version: 14.x.x maintainers: - email: lwj5@hotmail.com name: lwj5 diff --git a/charts/invoiceninja/README.md b/charts/invoiceninja/README.md index 258f3bd..d5e53ce 100644 --- a/charts/invoiceninja/README.md +++ b/charts/invoiceninja/README.md @@ -147,13 +147,13 @@ The following table shows the configuration options for the Invoice Ninja helm c ### Ingress parameters -| Parameter | Description | Default | -| ------------------------------------ | ------------------------------------- | ------------------------------------------------------- | -| `nginx.service.type` | Kubernetes Service type | `ClusterIP` | -| `nginx.ingress.enabled` | Enable ingress controller resource | `true` | -| `nginx.ingress.hostname` | Default host for the ingress resource | `invoiceninja.local` | +| Parameter | Description | Default | +| ------------------------------------ | ------------------------------------- | ------------------------------------------------------ | +| `nginx.service.type` | Kubernetes Service type | `ClusterIP` | +| `nginx.ingress.enabled` | Enable ingress controller resource | `true` | +| `nginx.ingress.hostname` | Default host for the ingress resource | `invoiceninja.local` | | `nginx.existingServerBlockConfigmap` | Custom NGINX server block config map | `{{ include "invoiceninja.nginx.serverBlockName" . }}` | -| `nginx.staticSitePVC` | Name of Invoice Ninja public PVC | `{{ include "invoiceninja.public.storageName" . }}` | +| `nginx.staticSitePVC` | Name of Invoice Ninja public PVC | `{{ include "invoiceninja.public.storageName" . }}` | > See [Dependencies](#dependencies) for more. @@ -179,9 +179,9 @@ The following table shows the configuration options for the Invoice Ninja helm c | Parameter | Description | Default | | --------------------------------- | -------------------------------------------- | ----------------------------------------- | | `redis.enabled` | If external redis is used, set it to `false` | `true` | -| `redis.password` | Redis password | _random 10 character alphanumeric string_ | +| `redis.auth.password` | Redis password | _random 10 character alphanumeric string_ | +| `redis.auth.sentinel` | Use password for sentinel containers | `false` | | `redis.sentinel.enabled` | Enable sentinel containers | `true` | -| `redis.sentinel.usePassword` | Use password for sentinel containers | `false` | | `externalRedis.host` | Host of the external redis | `nil` | | `externalRedis.port` | Port of the external redis | `6379` | | `externalRedis.password` | Password for the external redis | `nil` | @@ -284,4 +284,7 @@ extraEnvVarsCM: examplemap ## Upgrading -Nothing yet. +### To 0.7.0 + +Redis chart dependency has been upgraded and may not be backwards compatible with previous versions. See [here](https://github.com/bitnami/charts/tree/master/bitnami/redis) for more info. + diff --git a/charts/invoiceninja/templates/deployment.yaml b/charts/invoiceninja/templates/deployment.yaml index 8292d47..bf647a5 100644 --- a/charts/invoiceninja/templates/deployment.yaml +++ b/charts/invoiceninja/templates/deployment.yaml @@ -167,7 +167,7 @@ spec: secretKeyRef: name: {{ include "invoiceninja.databaseSecretName" . }} key: mariadb-password - {{- if or (and .Values.redis.enabled .Values.redis.usePassword) (or .Values.externalRedis.password .Values.externalRedis.existingSecret) }} + {{- if or (and .Values.redis.enabled .Values.redis.auth.enabled) (or .Values.externalRedis.password .Values.externalRedis.existingSecret) }} - name: REDIS_PASSWORD valueFrom: secretKeyRef: diff --git a/charts/invoiceninja/values.yaml b/charts/invoiceninja/values.yaml index 7855292..0e9bacb 100644 --- a/charts/invoiceninja/values.yaml +++ b/charts/invoiceninja/values.yaml @@ -377,9 +377,10 @@ autoscaling: ## redis: enabled: true + auth: + sentinel: false sentinel: enabled: true - usePassword: false ## External Redis Configuration ##