From ef8a37b05e6f8589e496e01adc4eb3e71352948a Mon Sep 17 00:00:00 2001 From: Rafal Proszowski Date: Sun, 20 Oct 2019 13:35:36 +0100 Subject: [PATCH] [stable/sentry] Bump dependencies and allow dependency naming (#16996) * Update Postgres depenency The chart has been updated a lot, since we've introduced that dependency. It mainly introduces new version of Postgres and doesn't seem to break the general functionality. It does introduce some template changes and fixes a single problem, where policy has an empty value and causes kubernetes to fall out in persistant volume claim. ```yaml annotations: "helm.sh/resource-policy": ``` Signed-off-by: Rafal Proszowski * Upgrade Redis chart We're simply running an old version, and it may be a pain to upgrade later in the future. Signed-off-by: Rafal Proszowski * Add support for overwritten naming It may be a case, when a user would like to install two different instances of postgres or redis in the same namespace with a single release. This would cause one of the instances being overwritten by the other and lead to unwanted behaviour. Adding this support and prefixing sentry's dependencies, may solve that problem, and doesn't really strike as a bad practice. Signed-off-by: Rafal Proszowski * Bump sentry chart version Signed-off-by: Rafal Proszowski --- stable/sentry/Chart.yaml | 2 +- stable/sentry/README.md | 12 ++++---- stable/sentry/requirements.lock | 8 +++--- stable/sentry/requirements.yaml | 4 +-- stable/sentry/templates/_helpers.tpl | 28 +++++++++++++++---- stable/sentry/templates/cron-deployment.yaml | 6 ++-- .../sentry/templates/hooks/db-init.job.yaml | 6 ++-- .../templates/hooks/user-create.job.yaml | 6 ++-- stable/sentry/templates/secrets.yaml | 2 +- stable/sentry/templates/web-deployment.yaml | 6 ++-- .../sentry/templates/workers-deployment.yaml | 6 ++-- stable/sentry/values.yaml | 15 +++++----- 12 files changed, 59 insertions(+), 42 deletions(-) diff --git a/stable/sentry/Chart.yaml b/stable/sentry/Chart.yaml index a7e2ce2608..b0eb39cc30 100644 --- a/stable/sentry/Chart.yaml +++ b/stable/sentry/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Sentry is a cross-platform crash reporting and aggregation platform. name: sentry -version: 3.0.3 +version: 3.1.0 appVersion: 9.1.2 keywords: - debugging diff --git a/stable/sentry/README.md b/stable/sentry/README.md index 6658c15d1c..fa96c82c5e 100644 --- a/stable/sentry/README.md +++ b/stable/sentry/README.md @@ -122,11 +122,11 @@ Parameter | Description `ingress.path` | path to address your Sentry installation | `/` `ingress.tls` | Ingress TLS configuration | `[]` `postgresql.enabled` | Deploy postgres server (see below) | `true` -`postgresql.postgresDatabase` | Postgres database name | `sentry` -`postgresql.postgresUser` | Postgres username | `sentry` -`postgresql.postgresHost` | External postgres host | `nil` -`postgresql.postgresPassword` | External postgres password | `nil` -`postgresql.postgresPort` | External postgres port | `5432` +`postgresql.postgresqlDatabase` | Postgres database name | `sentry` +`postgresql.postgresqlUsername` | Postgres username | `postgres` +`postgresql.postgresqlHost` | External postgres host | `nil` +`postgresql.postgresqlPassword` | External postgres password | `nil` +`postgresql.postgresqlPort` | External postgres port | `5432` `redis.enabled` | Deploy redis server (see below) | `true` `redis.host` | External redis host | `nil` `redis.password` | External redis password | `nil` @@ -188,7 +188,7 @@ $ helm install --name my-release -f values.yaml stable/sentry ## PostgresSQL -By default, PostgreSQL is installed as part of the chart. To use an external PostgreSQL server set `postgresql.enabled` to `false` and then set `postgresql.postgresHost` and `postgresql.postgresPassword`. The other options (`postgresql.postgresDatabase`, `postgresql.postgresUser` and `postgresql.postgresPort`) may also want changing from their default values. +By default, PostgreSQL is installed as part of the chart. To use an external PostgreSQL server set `postgresql.enabled` to `false` and then set `postgresql.postgresHost` and `postgresql.postgresqlPassword`. The other options (`postgresql.postgresqlDatabase`, `postgresql.postgresqlUsername` and `postgresql.postgresqlPort`) may also want changing from their default values. ## Redis diff --git a/stable/sentry/requirements.lock b/stable/sentry/requirements.lock index e8a705a384..58daa55669 100644 --- a/stable/sentry/requirements.lock +++ b/stable/sentry/requirements.lock @@ -1,9 +1,9 @@ dependencies: - name: postgresql repository: https://kubernetes-charts.storage.googleapis.com/ - version: 0.18.0 + version: 6.5.0 - name: redis repository: https://kubernetes-charts.storage.googleapis.com/ - version: 3.8.1 -digest: sha256:2e645b00617ba18fb9c6b03eb0b1a7b6c1c0b6272f654fc455ef623faeeba0df -generated: 2019-01-30T14:20:03.270355538+01:00 + version: 9.3.2 +digest: sha256:ec1c090ef960c117f69fb79617eacfa01ee787312a5f00a1d5a3bfe97ae00ef6 +generated: "2019-10-20T12:47:31.239466+01:00" diff --git a/stable/sentry/requirements.yaml b/stable/sentry/requirements.yaml index 1aa2b85202..f2e8b8a579 100644 --- a/stable/sentry/requirements.yaml +++ b/stable/sentry/requirements.yaml @@ -1,9 +1,9 @@ dependencies: - name: postgresql - version: 0.18.0 + version: 6.5.0 repository: https://kubernetes-charts.storage.googleapis.com/ condition: postgresql.enabled - name: redis - version: 3.8.1 + version: 9.3.2 repository: https://kubernetes-charts.storage.googleapis.com/ condition: redis.enabled diff --git a/stable/sentry/templates/_helpers.tpl b/stable/sentry/templates/_helpers.tpl index 95126aaad3..8d8bb4cbc2 100644 --- a/stable/sentry/templates/_helpers.tpl +++ b/stable/sentry/templates/_helpers.tpl @@ -29,13 +29,31 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "sentry.postgresql.fullname" -}} -{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}} +{{- if .Values.postgresql.fullnameOverride -}} +{{- .Values.postgresql.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.postgresql.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name "sentry-postgresql" | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} {{- end -}} {{- define "sentry.redis.fullname" -}} -{{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}} +{{- if .Values.redis.fullnameOverride -}} +{{- .Values.redis.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.redis.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name "sentry-redis" | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} {{- end -}} {{- define "sentry.smtp.fullname" -}} -{{- printf "%s-%s" .Release.Name "smtp" | trunc 63 | trimSuffix "-" -}} +{{- printf "%s-%s" .Release.Name "sentry-smtp" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* @@ -45,7 +63,7 @@ Set postgres host {{- if .Values.postgresql.enabled -}} {{- template "sentry.postgresql.fullname" . -}} {{- else -}} -{{- .Values.postgresql.postgresHost | quote -}} +{{- .Values.postgresql.postgresqlHost | quote -}} {{- end -}} {{- end -}} @@ -67,7 +85,7 @@ Set postgres port {{- if .Values.postgresql.enabled -}} "5432" {{- else -}} -{{- default "5432" .Values.postgresql.postgresPort | quote -}} +{{- default "5432" .Values.postgresql.postgresqlPort | quote -}} {{- end -}} {{- end -}} diff --git a/stable/sentry/templates/cron-deployment.yaml b/stable/sentry/templates/cron-deployment.yaml index 20248ecab5..c00c35be8d 100644 --- a/stable/sentry/templates/cron-deployment.yaml +++ b/stable/sentry/templates/cron-deployment.yaml @@ -60,9 +60,9 @@ spec: name: {{ template "sentry.fullname" . }} key: sentry-secret - name: SENTRY_DB_USER - value: {{ default "sentry" .Values.postgresql.postgresUser | quote }} + value: {{ default "sentry" .Values.postgresql.postgresqlUsername | quote }} - name: SENTRY_DB_NAME - value: {{ default "sentry" .Values.postgresql.postgresDatabase | quote }} + value: {{ default "sentry" .Values.postgresql.postgresqlDatabase | quote }} - name: SENTRY_DB_PASSWORD valueFrom: secretKeyRef: @@ -71,7 +71,7 @@ spec: {{- else }} name: {{ template "sentry.postgresql.secret" . }} {{- end }} - key: postgres-password + key: postgresql-password - name: SENTRY_POSTGRES_HOST value: {{ template "sentry.postgresql.host" . }} - name: SENTRY_POSTGRES_PORT diff --git a/stable/sentry/templates/hooks/db-init.job.yaml b/stable/sentry/templates/hooks/db-init.job.yaml index 9e644894bd..954aeff4bd 100644 --- a/stable/sentry/templates/hooks/db-init.job.yaml +++ b/stable/sentry/templates/hooks/db-init.job.yaml @@ -47,9 +47,9 @@ spec: name: {{ template "sentry.fullname" . }} key: sentry-secret - name: SENTRY_DB_USER - value: {{ default "sentry" .Values.postgresql.postgresUser | quote }} + value: {{ default "sentry" .Values.postgresql.postgresqlUsername | quote }} - name: SENTRY_DB_NAME - value: {{ default "sentry" .Values.postgresql.postgresDatabase | quote }} + value: {{ default "sentry" .Values.postgresql.postgresqlDatabase | quote }} - name: SENTRY_DB_PASSWORD valueFrom: secretKeyRef: @@ -58,7 +58,7 @@ spec: {{- else }} name: {{ template "sentry.postgresql.secret" . }} {{- end }} - key: postgres-password + key: postgresql-password - name: SENTRY_POSTGRES_HOST value: {{ template "sentry.postgresql.host" . }} - name: SENTRY_POSTGRES_PORT diff --git a/stable/sentry/templates/hooks/user-create.job.yaml b/stable/sentry/templates/hooks/user-create.job.yaml index fc41908fc6..8e03d9af95 100644 --- a/stable/sentry/templates/hooks/user-create.job.yaml +++ b/stable/sentry/templates/hooks/user-create.job.yaml @@ -47,9 +47,9 @@ spec: name: {{ template "sentry.fullname" . }} key: sentry-secret - name: SENTRY_DB_USER - value: {{ default "sentry" .Values.postgresql.postgresUser | quote }} + value: {{ default "sentry" .Values.postgresql.postgresqlUsername | quote }} - name: SENTRY_DB_NAME - value: {{ default "sentry" .Values.postgresql.postgresDatabase | quote }} + value: {{ default "sentry" .Values.postgresql.postgresqlDatabase | quote }} - name: SENTRY_DB_PASSWORD valueFrom: secretKeyRef: @@ -58,7 +58,7 @@ spec: {{- else }} name: {{ template "sentry.postgresql.secret" . }} {{- end }} - key: postgres-password + key: postgresql-password - name: SENTRY_POSTGRES_HOST value: {{ template "sentry.postgresql.host" . }} - name: SENTRY_POSTGRES_PORT diff --git a/stable/sentry/templates/secrets.yaml b/stable/sentry/templates/secrets.yaml index b11e7fd9b4..0ac1fa5adc 100644 --- a/stable/sentry/templates/secrets.yaml +++ b/stable/sentry/templates/secrets.yaml @@ -23,7 +23,7 @@ data: user-password: {{ randAlphaNum 16 | b64enc | quote }} {{ end }} {{ if not .Values.postgresql.enabled }} - postgres-password: {{ .Values.postgresql.postgresPassword | default "" | b64enc | quote }} + postgresql-password: {{ .Values.postgresql.postgresqlPassword | default "" | b64enc | quote }} {{ end }} {{ if and (not .Values.redis.enabled) (.Values.redis.password) }} redis-password: {{ .Values.redis.password | default "" | b64enc | quote }} diff --git a/stable/sentry/templates/web-deployment.yaml b/stable/sentry/templates/web-deployment.yaml index bc1f313125..eb1d0c230b 100644 --- a/stable/sentry/templates/web-deployment.yaml +++ b/stable/sentry/templates/web-deployment.yaml @@ -59,9 +59,9 @@ spec: name: {{ template "sentry.fullname" . }} key: sentry-secret - name: SENTRY_DB_USER - value: {{ default "sentry" .Values.postgresql.postgresUser | quote }} + value: {{ default "sentry" .Values.postgresql.postgresqlUsername | quote }} - name: SENTRY_DB_NAME - value: {{ default "sentry" .Values.postgresql.postgresDatabase | quote }} + value: {{ default "sentry" .Values.postgresql.postgresqlDatabase | quote }} - name: SENTRY_DB_PASSWORD valueFrom: secretKeyRef: @@ -70,7 +70,7 @@ spec: {{- else }} name: {{ template "sentry.postgresql.secret" . }} {{- end }} - key: postgres-password + key: postgresql-password - name: SENTRY_POSTGRES_HOST value: {{ template "sentry.postgresql.host" . }} - name: SENTRY_POSTGRES_PORT diff --git a/stable/sentry/templates/workers-deployment.yaml b/stable/sentry/templates/workers-deployment.yaml index 4d2cca0e33..f47936896f 100644 --- a/stable/sentry/templates/workers-deployment.yaml +++ b/stable/sentry/templates/workers-deployment.yaml @@ -69,9 +69,9 @@ spec: name: {{ template "sentry.fullname" . }} key: sentry-secret - name: SENTRY_DB_USER - value: {{ default "sentry" .Values.postgresql.postgresUser | quote }} + value: {{ default "sentry" .Values.postgresql.postgresqlUsername | quote }} - name: SENTRY_DB_NAME - value: {{ default "sentry" .Values.postgresql.postgresDatabase | quote }} + value: {{ default "sentry" .Values.postgresql.postgresqlDatabase | quote }} - name: SENTRY_DB_PASSWORD valueFrom: secretKeyRef: @@ -80,7 +80,7 @@ spec: {{- else }} name: {{ template "sentry.postgresql.secret" . }} {{- end }} - key: postgres-password + key: postgresql-password - name: SENTRY_POSTGRES_HOST value: {{ template "sentry.postgresql.host" . }} - name: SENTRY_POSTGRES_PORT diff --git a/stable/sentry/values.yaml b/stable/sentry/values.yaml index ac2f55fe41..3b23969990 100644 --- a/stable/sentry/values.yaml +++ b/stable/sentry/values.yaml @@ -188,18 +188,17 @@ ingress: postgresql: enabled: true - postgresDatabase: sentry - postgresUser: sentry + nameOverride: sentry-postgresql + postgresqlDatabase: sentry + postgresqlUsername: postgres # Only used when internal PG is disabled - # postgresHost: postgres - # postgresPassword: postgres - # postgresPort: 5432 - imageTag: "9.6" - persistence: - enabled: true + # postgresqlHost: postgres + # postgresqlPassword: postgres + # postgresqlPort: 5432 redis: enabled: true + nameOverride: sentry-redis # Only used when internal redis is disabled # host: redis # Just omit the password field if your redis cluster doesn't use password