From 69cedfe32cf1cd7a237e5d23680f8d920a335d12 Mon Sep 17 00:00:00 2001 From: Marius Wernicke Date: Mon, 2 Oct 2023 15:45:06 +0200 Subject: [PATCH 1/3] Fixed postgresql includes and templates --- charts/shlink-backend/Chart.yaml | 6 +++--- charts/shlink-backend/templates/deployment.yaml | 12 ++++++------ charts/shlink-backend/values.yaml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/shlink-backend/Chart.yaml b/charts/shlink-backend/Chart.yaml index 785e3d09..fe06e61e 100644 --- a/charts/shlink-backend/Chart.yaml +++ b/charts/shlink-backend/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: shlink-backend description: A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own domain. type: application -version: 2.12.2 -appVersion: "3.6.3" +version: 2.12.4 +appVersion: "3.6.4" home: https://github.com/christianknell/helm-charts icon: https://shlink.io/images/shlink-logo-blue.svg maintainers: @@ -36,4 +36,4 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: bumped chart version of postgresql to 12.12.9 + description: Fixed postgresql includes and templates diff --git a/charts/shlink-backend/templates/deployment.yaml b/charts/shlink-backend/templates/deployment.yaml index 9410e3e5..9f4133ee 100644 --- a/charts/shlink-backend/templates/deployment.yaml +++ b/charts/shlink-backend/templates/deployment.yaml @@ -81,18 +81,18 @@ spec: - name: DB_DRIVER value: postgres - name: DB_HOST - value: {{ include "postgresql.primary.fullname" .Subcharts.postgresql }} + value: {{ include "postgresql.v1.primary.fullname" .Subcharts.postgresql }} - name: DB_PORT - value: {{ include "postgresql.service.port" .Subcharts.postgresql | quote }} + value: {{ include "postgresql.v1.service.port" .Subcharts.postgresql | quote }} - name: DB_NAME - value: {{ include "postgresql.database" .Subcharts.postgresql }} + value: {{ include "postgresql.v1.database" .Subcharts.postgresql }} - name: DB_USER - value: {{ include "postgresql.username" .Subcharts.postgresql }} + value: {{ include "postgresql.v1.username" .Subcharts.postgresql }} - name: DB_PASSWORD valueFrom: secretKeyRef: - name: {{ template "postgresql.secretName" .Subcharts.postgresql }} - key: {{ template "postgresql.userPasswordKey" .Subcharts.postgresql }} + name: {{ template "postgresql.v1.secretName" .Subcharts.postgresql }} + key: {{ template "postgresql.v1.userPasswordKey" .Subcharts.postgresql }} {{- end }} # RabbitMQ Settings {{- if .Values.rabbitmq.enabled }} diff --git a/charts/shlink-backend/values.yaml b/charts/shlink-backend/values.yaml index 07e33d7a..d393c0b8 100644 --- a/charts/shlink-backend/values.yaml +++ b/charts/shlink-backend/values.yaml @@ -9,7 +9,7 @@ image: # -- image pull policy pullPolicy: Always # -- Overrides the image tag - tag: "3.6.3" + tag: "3.6.4" # -- If defined, uses a Secret to pull an image from a private Docker registry or repository. imagePullSecrets: [] From a8e562cbfb3c24dbb04a3ce78e5e34e70e21176d Mon Sep 17 00:00:00 2001 From: Christian Knell Date: Tue, 3 Oct 2023 18:03:38 +0200 Subject: [PATCH 2/3] Update README.md --- charts/shlink-backend/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/shlink-backend/README.md b/charts/shlink-backend/README.md index 7be6adab..67ff9b06 100644 --- a/charts/shlink-backend/README.md +++ b/charts/shlink-backend/README.md @@ -58,7 +58,7 @@ The command removes all the Kubernetes components associated with the chart and | fullnameOverride | string | `""` | String to fully override `"shlink-backend.fullname"` | | image.pullPolicy | string | `"Always"` | image pull policy | | image.repository | string | `"shlinkio/shlink"` | image repository | -| image.tag | string | `"3.6.3"` | Overrides the image tag | +| image.tag | string | `"3.6.4"` | Overrides the image tag | | imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository. | | ingress.annotations | object | `{}` | | | ingress.className | string | `""` | | From 922b54319c8bee93ee507ecce0b5800436d7f81a Mon Sep 17 00:00:00 2001 From: Christian Knell Date: Tue, 3 Oct 2023 18:11:34 +0200 Subject: [PATCH 3/3] Update Chart.yaml --- charts/shlink-backend/Chart.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/shlink-backend/Chart.yaml b/charts/shlink-backend/Chart.yaml index fe06e61e..9260adcb 100644 --- a/charts/shlink-backend/Chart.yaml +++ b/charts/shlink-backend/Chart.yaml @@ -36,4 +36,6 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: Fixed postgresql includes and templates + description: bumped image version to 3.6.4 + - kind: fixed + description: postgresql includes and templates