Skip to content

fix: add references to sslmode for postgres dbs #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 17, 2025
Merged

fix: add references to sslmode for postgres dbs #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f63fba
fix: add references to sslmode for postgres dbs
Chickensoupwithrice Jan 16, 2025
563eb4e
fix: regenerate docs and update test checksums
Chickensoupwithrice Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions charts/sourcegraph-migrator/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,9 @@ useGlobalTagAsDefault configuration
secretKeyRef:
key: user
name: {{ $secretName }}
- name: {{ printf "%sSSLMODE" $prefix }}
valueFrom:
secretKeyRef:
key: sslmode
name: {{ $secretName }}
{{- end }}
3 changes: 3 additions & 0 deletions charts/sourcegraph/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ In addition to the documented values, all services also support the following va
| codeInsightsDB.auth.host | string | `"codeinsights-db"` | Sets codeinsights-db host |
| codeInsightsDB.auth.password | string | `"password"` | Sets codeinsights-db password |
| codeInsightsDB.auth.port | string | `"5432"` | Sets codeinsights-db port |
| codeInsightsDB.auth.sslmode | string | `"disable"` | Sets codeinsights-db SSL mode |
| codeInsightsDB.auth.user | string | `"postgres"` | Sets codeinsights-db username |
| codeInsightsDB.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":70,"runAsUser":70}` | Security context for the `codeinsights-db` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
| codeInsightsDB.enabled | bool | `true` | Enable `codeinsights-db` PostgreSQL server |
Expand All @@ -77,6 +78,7 @@ In addition to the documented values, all services also support the following va
| codeIntelDB.auth.host | string | `"codeintel-db"` | Sets codeintel-db host |
| codeIntelDB.auth.password | string | `"password"` | Sets codeintel-db password |
| codeIntelDB.auth.port | string | `"5432"` | Sets codeintel-db port |
| codeIntelDB.auth.sslmode | string | `"disable"` | Sets codeintel-db SSL mode |
| codeIntelDB.auth.user | string | `"sg"` | Sets codeintel-db username |
| codeIntelDB.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":999,"runAsUser":999}` | Security context for the `codeintel-db` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
| codeIntelDB.enabled | bool | `true` | Enable `codeintel-db` PostgreSQL server |
Expand Down Expand Up @@ -219,6 +221,7 @@ In addition to the documented values, all services also support the following va
| pgsql.auth.host | string | `"pgsql"` | Sets postgres host |
| pgsql.auth.password | string | `"password"` | Sets postgres password |
| pgsql.auth.port | string | `"5432"` | Sets postgres port |
| pgsql.auth.sslmode | string | `"disable"` | Sets postgres SSL mode |
| pgsql.auth.user | string | `"sg"` | Sets postgres username |
| pgsql.containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"readOnlyRootFilesystem":true,"runAsGroup":999,"runAsUser":999}` | Security context for the `pgsql` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
| pgsql.enabled | bool | `true` | Enable `pgsql` PostgreSQL server |
Expand Down
1 change: 1 addition & 0 deletions charts/sourcegraph/examples/external-databases/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ data:
password: ""
port: ""
user: ""
pgsslmode: "require" # optional, enable if using SSL
```

The Secret name should be set in your override file in the `auth.existingSecret` key for each database. See the [override.yaml] for an example.
Expand Down
5 changes: 5 additions & 0 deletions charts/sourcegraph/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ app.kubernetes.io/name: jaeger
secretKeyRef:
key: user
name: {{ $secretName }}
- name: {{ printf "%sSSLMODE" $prefix }}
valueFrom:
secretKeyRef:
key: sslmode
name: {{ $secretName }}
{{- if eq $service "grafana" }}
- name: {{ printf "%sSSLMODE" $prefix }}
valueFrom:
Expand Down
1 change: 1 addition & 0 deletions charts/sourcegraph/templates/codeinsights-db/codeinsights-db.Secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ data:
password: {{ .Values.codeInsightsDB.auth.password | toString | b64enc | quote }}
port: {{ .Values.codeInsightsDB.auth.port | toString | b64enc | quote }}
user: {{ .Values.codeInsightsDB.auth.user | toString | b64enc | quote }}
sslmode: {{ .Values.codeInsightsDB.auth.sslmode | toString | b64enc | quote }}
{{- end -}}
1 change: 1 addition & 0 deletions charts/sourcegraph/templates/codeintel-db/codeintel-db.Secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ data:
password: {{ .Values.codeIntelDB.auth.password | toString | b64enc | quote }}
port: {{ .Values.codeIntelDB.auth.port | toString | b64enc | quote }}
user: {{ .Values.codeIntelDB.auth.user | toString | b64enc | quote }}
sslmode: {{ .Values.codeIntelDB.auth.sslmode | toString | b64enc | quote }}
{{- end -}}
1 change: 1 addition & 0 deletions charts/sourcegraph/templates/pgsql/pgsql.Secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ data:
password: {{ .Values.pgsql.auth.password | toString | b64enc | quote }}
port: {{ .Values.pgsql.auth.port | toString | b64enc | quote }}
user: {{ .Values.pgsql.auth.user | toString | b64enc | quote }}
sslmode: {{ .Values.pgsql.auth.sslmode | toString | b64enc | quote }}
{{- end -}}
10 changes: 5 additions & 5 deletions charts/sourcegraph/tests/__snapshot__/checksum_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
should update checksum when codeinsights-db secret is modified:
1: |
b60668796ecf6c0c43c250feeb4f61583494b50c518d145753612c0f3e10d2d1
29f56ffb20b2f033b6f54a3b8e4f049734a9330390bc4e4b162a792e073b9447
should update checksum when codeintel-db secret is modified:
1: |
393b4697f158c0151c67f84d2caf81894565f9928a68fe4cea86de62c2784c3c
839b4e7703dfa58ea8513e436a017af6183d7e5c3d8560a8d580bef8299242fb
should update checksum when pgsql secret is modified:
1: |
9edce55c26da40c6a2f12025db322495f2f2a50183f234d7476d486134434aa2
54b0ee5944d429d618699fa4e18a406fb817668d9111bb43b46eac363415e5b2
should update checksum when redis-cache secret is modified:
1: |
cffe7781e068ed7f9b5cff231361a3973a2a3378a28cf047a9a5ad77c832732c
97d7112d6b8b0d3e6251d9062aaba1a7205fda567b701d70eecc4540878228c0
should update checksum when redis-store secret is modified:
1: |
cffe7781e068ed7f9b5cff231361a3973a2a3378a28cf047a9a5ad77c832732c
97d7112d6b8b0d3e6251d9062aaba1a7205fda567b701d70eecc4540878228c0
4 changes: 2 additions & 2 deletions charts/sourcegraph/tests/__snapshot__/pgsqlAuth_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
should reference default secret name when existingSecret is blank:
1: |
180940fdb956526d197a8efaf15bc2f14a3db83e09610917f8b9040fa5232d39
0fa09c505c8e425627c62e0bb13c3ecb575b6c117a2b976fd1a4e71dd41561f6
should reference existing secret name when existingSecret is passed:
1: |
e5de6930e808d2ef402f404c12b53ff96e57ac6818a72ed19ab0aa4caf588596
75d732cb063b4c32166d42a620df3c0b2b9fa139f28a560c9c566d36b150e6c3
8 changes: 7 additions & 1 deletion charts/sourcegraph/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ codeInsightsDB:
password: "password"
# -- Sets codeinsights-db port
port: "5432"
# -- Sets codeinsights-db SSL mode
sslmode: "disable" # set to "require" to enable SSL
# -- Environment variables for the `codeinsights-db` container
env: {}
# -- Name of existing ConfigMap for `codeinsights-db`. It must contain a `postgresql.conf` key.
Expand Down Expand Up @@ -237,6 +239,8 @@ codeIntelDB:
password: "password"
# -- Sets codeintel-db port
port: "5432"
# -- Sets codeintel-db SSL mode
sslmode: "disable" # set to "require" to enable SSL
# -- Name of existing ConfigMap for `codeintel-db`. It must contain a `postgresql.conf` key
existingConfig: ""
# -- Additional PostgreSQL configuration. This will override or extend our default configuration.
Expand Down Expand Up @@ -721,8 +725,10 @@ pgsql:
password: "password"
# -- Sets postgres port
port: "5432"
# -- Sets postgres SSL mode
sslmode: "disable" # set to "require" to enable SSL
# -- Name of existing ConfigMap for `pgsql`. It must contain a `postgresql.conf` key
existingConfig: "" # Name of an existing configmap
existingConfig: "" # Name of an existing configmap
# -- Additional PostgreSQL configuration. This will override or extend our default configuration.
# Notes: This is expecting a multiline string.
# Learn more from our [recommended PostgreSQL configuration](https://docs.sourcegraph.com/admin/config/postgres-conf) and [PostgreSQL documentation](https://www.postgresql.org/docs/12/config-setting.html)
Expand Down
Loading