Skip to content

Commit

Permalink
Merge pull request #306 from concourse/upgrade-postgresql-11
Browse files Browse the repository at this point in the history
bump postgres chart to v11
  • Loading branch information
Rui Yang authored Jun 3, 2022
2 parents 4b4da57 + ade9143 commit 1b91df5
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 25 deletions.
6 changes: 3 additions & 3 deletions Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.16.2
digest: sha256:e09e206d81074a6540102fb62b8b12cf943c934c2af21e58ff8caa259690e87a
generated: "2022-02-07T18:00:25.772548898Z"
version: 11.2.6
digest: sha256:cd29aa2e74edb450e3de95bcef02b83f1f3331c4534b6cd31f41d84ba458f068
generated: "2022-05-25T17:34:55.047613-04:00"
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sources:
- https://github.com/concourse/concourse
dependencies:
- name: postgresql
version: 10.16.2
version: 11.2.6
repository: https://charts.bitnami.com/bitnami
condition: postgresql.enabled
maintainers:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ The following table lists the configurable parameters of the Concourse chart and
| `postgresql.persistence.size` | Persistent Volume Storage Size | `8Gi` |
| `postgresql.persistence.storageClass` | Concourse data Persistent Volume Storage Class | `nil` |
| `persistence.worker.selector` | Concourse Worker Persistent Volume selector | `nil` |
| `postgresql.postgresqlDatabase` | PostgreSQL Database to create | `concourse` |
| `postgresql.postgresqlPassword` | PostgreSQL Password for the new user | `concourse` |
| `postgresql.postgresqlUsername` | PostgreSQL User to create | `concourse` |
| `postgresql.auth.database` | PostgreSQL Database to create | `concourse` |
| `postgresql.auth.password` | PostgreSQL Password for the new user | `concourse` |
| `postgresql.auth.username` | PostgreSQL User to create | `concourse` |
| `rbac.apiVersion` | RBAC version | `v1beta1` |
| `rbac.create` | Enables creation of RBAC resources | `true` |
| `rbac.webServiceAccountName` | Name of the service account to use for web pods if `rbac.create` is `false` | `default` |
Expand Down Expand Up @@ -502,7 +502,7 @@ web:
### PostgreSQL
By default, this chart uses a PostgreSQL database deployed as a chart dependency (see the [PostgreSQL chart](https://github.com/bitnami/charts/blob/master/bitnami/postgresql/README.md)), with default values for username, password, and database name. These can be modified by setting the `postgresql.*` values.
By default, this chart uses a PostgreSQL database deployed as a chart dependency (see the [PostgreSQL chart](https://github.com/bitnami/charts/blob/master/bitnami/postgresql/README.md)), with default values for username, password, and database name. These can be modified by setting the `postgresql.auth.*` values.

You can also bring your own PostgreSQL. To do so, set `postgresql.enabled` to `false`, and then configure Concourse's `postgres` values (`concourse.web.postgres.*`).

Expand Down
6 changes: 3 additions & 3 deletions templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -422,14 +422,14 @@ Return concourse environment variables for postgresql configuration
- name: CONCOURSE_POSTGRES_HOST
value: {{ template "concourse.postgresql.fullname" . }}
- name: CONCOURSE_POSTGRES_USER
value: {{ .Values.postgresql.postgresqlUsername | quote }}
value: {{ .Values.postgresql.auth.username | quote }}
- name: CONCOURSE_POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "concourse.postgresql.fullname" . }}
key: postgresql-password
key: password
- name: CONCOURSE_POSTGRES_DATABASE
value: {{ .Values.postgresql.postgresqlDatabase | quote }}
value: {{ .Values.postgresql.auth.database | quote }}
{{- else }}
{{- if .Values.concourse.web.postgres.host }}
- name: CONCOURSE_POSTGRES_HOST
Expand Down
2 changes: 1 addition & 1 deletion templates/web-podsecuritypolicy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.web.enabled -}}
{{- if .Values.podSecurityPolicy.create -}}
apiVersion: policy/v1beta1
apiVersion: policy/v1
kind: PodSecurityPolicy
metadata:
name: {{ template "concourse.web.fullname" . }}
Expand Down
2 changes: 1 addition & 1 deletion templates/worker-podsecuritypolicy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.worker.enabled -}}
{{- if .Values.podSecurityPolicy.create -}}
apiVersion: policy/v1beta1
apiVersion: policy/v1
kind: PodSecurityPolicy
metadata:
name: {{ template "concourse.worker.fullname" . }}
Expand Down
2 changes: 1 addition & 1 deletion templates/worker-policy.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if .Values.worker.enabled -}}
apiVersion: policy/v1beta1
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ template "concourse.worker.fullname" . }}
Expand Down
24 changes: 13 additions & 11 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ concourse:

## Enable P2P volume streaming between all wokrers.
## By default all volume streming goes through the web nodes.
## NOTE: All workers must be on the same LAN network.
##
enablep2pVolumeStreaming: false

Expand Down Expand Up @@ -2610,7 +2611,7 @@ persistence:
# app-volume: "concourse"

## Configuration values for the postgresql dependency.
## Ref: https://github.com/helm/charts/blob/master/stable/postgresql/README.md
## Ref: https://github.com/bitnami/charts/blob/master/bitnami/postgresql/README.md
##
postgresql:

Expand All @@ -2629,18 +2630,19 @@ postgresql:
##
fullnameOverride:

### PostgreSQL User to create.
##
postgresqlUsername: concourse
auth:
### PostgreSQL User to create.
##
username: concourse

## PostgreSQL Password for the new user.
## If not set, a random 10 characters password will be used.
##
postgresqlPassword: concourse
## PostgreSQL Password for the new user.
## If not set, a random 10 characters password will be used.
##
password: concourse

## PostgreSQL Database to create.
##
postgresqlDatabase: concourse
## PostgreSQL Database to create.
##
database: concourse

## Allows for setting a specific cluster ip for the PostgreSQL
## service.
Expand Down

0 comments on commit 1b91df5

Please sign in to comment.