github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/sentry] Bump dependencies and allow dependency naming (#16996)

Browse Source 
* 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 <rafal.proszowski@digital.cabinet-office.gov.uk>

* 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 <rafal.proszowski@digital.cabinet-office.gov.uk>

* 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 <rafal.proszowski@digital.cabinet-office.gov.uk>

* Bump sentry chart version

Signed-off-by: Rafal Proszowski <rafal.proszowski@digital.cabinet-office.gov.uk>
This commit is contained in:
Rafal Proszowski
2019-10-20 05:35:36 -07:00
committed by Kubernetes Prow Robot
parent 1869ecb496
commit ef8a37b05e
12 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/sentry/Chart.yaml
+1 -1
View File
@@ -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
stable/sentry/README.md
+6 -6
View File
@@ -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
stable/sentry/requirements.lock
+4 -4
View File
@@ -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"
stable/sentry/requirements.yaml
+2 -2
View File
@@ -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
stable/sentry/templates/_helpers.tpl
+23 -5
View File
@@ -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 -}}
stable/sentry/templates/cron-deployment.yaml
+3 -3
View File
@@ -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
stable/sentry/templates/hooks/db-init.job.yaml
+3 -3
View File
@@ -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
stable/sentry/templates/hooks/user-create.job.yaml
+3 -3
View File
@@ -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
stable/sentry/templates/secrets.yaml
+1 -1
View File
@@ -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 }}
stable/sentry/templates/web-deployment.yaml
+3 -3
View File
@@ -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
stable/sentry/templates/workers-deployment.yaml
+3 -3
View File
@@ -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
stable/sentry/values.yaml
+7 -8
View File
@@ -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