Skip to content

Commit

Permalink
Fix issue where not providing a password causes a failure on deploy (#97
Browse files Browse the repository at this point in the history
)
  • Loading branch information
jimid27 authored Dec 13, 2022
1 parent 2f63c92 commit f111427
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,4 @@ Chart.lock

# IDEs
.vscode/
.idea/
.idea/
8 changes: 6 additions & 2 deletions charts/prefect-agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@ description: Prefect Agent application bundle
engine: gotpl
home: https://github.com/PrefectHQ
maintainers:
- name: gabcoyne
email: george@prefect.io
- name: jamiezieziula
email: jamie@prefect.io
- name: jimid27
email: jimi@prefect.io
- name: parkedwards
email: edward@prefect.io
- name: jawnsy
email: jonathan@prefect.io
name: prefect-agent
sources:
- https://github.com/PrefectHQ/prefect-helm
Expand Down
4 changes: 3 additions & 1 deletion charts/prefect-agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ Prefect Agent application bundle

| Name | Email | Url |
| ---- | ------ | --- |
| gabcoyne | <george@prefect.io> | |
| jamiezieziula | <jamie@prefect.io> | |
| jimid27 | <jimi@prefect.io> | |
| parkedwards | <edward@prefect.io> | |
| jawnsy | <jonathan@prefect.io> | |

## Source Code

Expand Down
8 changes: 6 additions & 2 deletions charts/prefect-orion/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@ description: Prefect orion application bundle
engine: gotpl
home: https://github.com/PrefectHQ
maintainers:
- name: gabcoyne
email: george@prefect.io
- name: jamiezieziula
email: jamie@prefect.io
- name: jimid27
email: jimi@prefect.io
- name: parkedwards
email: edward@prefect.io
- name: jawnsy
email: jonathan@prefect.io
name: prefect-orion
sources:
- https://github.com/PrefectHQ/prefect-helm
Expand Down
5 changes: 4 additions & 1 deletion charts/prefect-orion/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ Prefect orion application bundle

| Name | Email | Url |
| ---- | ------ | --- |
| gabcoyne | <george@prefect.io> | |
| jamiezieziula | <jamie@prefect.io> | |
| jimid27 | <jimi@prefect.io> | |
| parkedwards | <edward@prefect.io> | |
| jawnsy | <jonathan@prefect.io> | |

## Source Code

Expand Down Expand Up @@ -76,6 +78,7 @@ Prefect orion application bundle
| orion.resources.requests | object | `{}` | the requested resources for the orion container |
| orion.tolerations | list | `[]` | tolerations for orion pods assignment |
| postgresql.auth.database | string | `"orion"` | name for a custom database to create |
| postgresql.auth.enablePostgresUser | bool | `false` | determines whether an admin user is created within postgres |
| postgresql.auth.existingSecret | string | `nil` | Name of existing secret to use for PostgreSQL credentials. |
| postgresql.auth.password | string | `""` | password for the custom user to create. Ignored if `auth.existingSecret` with key `password` is provided |
| postgresql.auth.username | string | `"prefect"` | name for a custom user to create |
Expand Down
2 changes: 1 addition & 1 deletion charts/prefect-orion/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Create the name of the service account to use
*/}}
{{- define "orion.postgres-connstr" -}}
{{- $user := .Values.postgresql.auth.username -}}
{{- $pass := .Values.postgresql.auth.password -}}
{{- $pass := .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required." -}}
{{- $host := include "orion.postgres-hostname" . -}}
{{- $port := .Values.postgresql.containerPorts.postgresql | toString -}}
{{- $db := .Values.postgresql.auth.database -}}
Expand Down
5 changes: 4 additions & 1 deletion charts/prefect-orion/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ ingress:
postgresql:
enabled: true
auth:
# -- determines whether an admin user is created within postgres
enablePostgresUser: false
# -- name for a custom database to create
database: orion
# -- name for a custom user to create
Expand All @@ -224,8 +226,9 @@ postgresql:
# -- password for the custom user to create. Ignored if `auth.existingSecret` with key `password` is provided
password: ""

## This secret must contain a key-value pair where the key is `connection-string` and the value is the
## This secret must contain two key-value pairs where the first key is `connection-string` and the value is the
## connection string containing your password (e.g. postgresql+asyncpg://{username}:{password}@{hostname}/{database}).
## The second key-value pair has the key `password` and the value is the {password} used in the connection string
# -- Name of existing secret to use for PostgreSQL credentials.
existingSecret: null

Expand Down

0 comments on commit f111427

Please sign in to comment.