diff --git a/Chart.lock b/Chart.lock index 41e36df1..449762cc 100644 --- a/Chart.lock +++ b/Chart.lock @@ -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" diff --git a/Chart.yaml b/Chart.yaml index 2e9e445a..c7e8c763 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -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: diff --git a/README.md b/README.md index 1e599b0f..74960b47 100644 --- a/README.md +++ b/README.md @@ -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` | @@ -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.*`). diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 11baa97e..9dd402cc 100755 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -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 diff --git a/templates/web-podsecuritypolicy.yaml b/templates/web-podsecuritypolicy.yaml index d9fcb448..0fac1bcb 100644 --- a/templates/web-podsecuritypolicy.yaml +++ b/templates/web-podsecuritypolicy.yaml @@ -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" . }} diff --git a/templates/worker-podsecuritypolicy.yaml b/templates/worker-podsecuritypolicy.yaml index 50403707..d44fc0c0 100644 --- a/templates/worker-podsecuritypolicy.yaml +++ b/templates/worker-podsecuritypolicy.yaml @@ -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" . }} diff --git a/templates/worker-policy.yaml b/templates/worker-policy.yaml index e09db8b1..2475f80a 100644 --- a/templates/worker-policy.yaml +++ b/templates/worker-policy.yaml @@ -1,5 +1,5 @@ {{- if .Values.worker.enabled -}} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodDisruptionBudget metadata: name: {{ template "concourse.worker.fullname" . }} diff --git a/values.yaml b/values.yaml index fa717b97..0434cbc4 100644 --- a/values.yaml +++ b/values.yaml @@ -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 @@ -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: @@ -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.