Skip to content

Add missing envs for external pg db #1689

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add missing envs for external pg db #1689

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
b4851d8
Add missing envs for external pg db
anisurrahman75 Aug 26, 2025
2cea237
Merge branch 'master' into add-missing-env
anisurrahman75 Sep 29, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ build-releases/
noobaa.cfg.yaml

*.IGNORE
.idea/
1 change: 1 addition & 0 deletions deploy/internal/deployment-endpoint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ spec:
- name: POSTGRES_PASSWORD_PATH
- name: POSTGRES_DBNAME_PATH
- name: POSTGRES_PORT_PATH
- name: POSTGRES_CONNECTION_STRING_PATH
- name: VIRTUAL_HOSTS
- name: REGION
- name: ENDPOINT_GROUP_ID
Expand Down
2 changes: 1 addition & 1 deletion deploy/internal/statefulset-core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ spec:
name: noobaa-config
key: NOOBAA_VERSION_AUTH_ENABLED
- name: POSTGRES_HOST
value: "noobaa-db-pg-0.noobaa-db-pg"
- name: POSTGRES_PORT
- name: POSTGRES_DBNAME
- name: POSTGRES_USER
Expand All @@ -131,6 +130,7 @@ spec:
- name: POSTGRES_PASSWORD_PATH
- name: POSTGRES_DBNAME_PATH
- name: POSTGRES_PORT_PATH
- name: POSTGRES_CONNECTION_STRING_PATH
- name: GUARANTEED_LOGS_PATH
- name: DB_TYPE
value: postgres
Expand Down
7 changes: 4 additions & 3 deletions pkg/bundle/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3979,7 +3979,7 @@ data:
shared_preload_libraries = 'pg_stat_statements'
`

const Sha256_deploy_internal_deployment_endpoint_yaml = "4221668694225599735ba859f68e47a9de8ce1aca685e0acd266c80e338bbda5"
const Sha256_deploy_internal_deployment_endpoint_yaml = "0a731c7ead9a584d6336eceb238375c21dbe42abb1de19ac46d6d03e657473e4"

const File_deploy_internal_deployment_endpoint_yaml = `apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -4110,6 +4110,7 @@ spec:
- name: POSTGRES_PASSWORD_PATH
- name: POSTGRES_DBNAME_PATH
- name: POSTGRES_PORT_PATH
- name: POSTGRES_CONNECTION_STRING_PATH
- name: VIRTUAL_HOSTS
- name: REGION
- name: ENDPOINT_GROUP_ID
Expand Down Expand Up @@ -5088,7 +5089,7 @@ spec:
noobaa-s3-svc: "true"
`

const Sha256_deploy_internal_statefulset_core_yaml = "34da89373b8398adb670d779a35f5c5a94365da99b5a2db65715fd62a7638d5c"
const Sha256_deploy_internal_statefulset_core_yaml = "14b945e65e510dbb0bce28f45034781ce06a8b597cf5ffe943b98c231b90b30f"

const File_deploy_internal_statefulset_core_yaml = `apiVersion: apps/v1
kind: StatefulSet
Expand Down Expand Up @@ -5210,7 +5211,6 @@ spec:
name: noobaa-config
key: NOOBAA_VERSION_AUTH_ENABLED
- name: POSTGRES_HOST
value: "noobaa-db-pg-0.noobaa-db-pg"
- name: POSTGRES_PORT
- name: POSTGRES_DBNAME
- name: POSTGRES_USER
Expand All @@ -5223,6 +5223,7 @@ spec:
- name: POSTGRES_PASSWORD_PATH
- name: POSTGRES_DBNAME_PATH
- name: POSTGRES_PORT_PATH
- name: POSTGRES_CONNECTION_STRING_PATH
- name: GUARANTEED_LOGS_PATH
- name: DB_TYPE
value: postgres
Expand Down
4 changes: 3 additions & 1 deletion pkg/system/phase2_creating.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,9 @@ func (r *Reconciler) setDesiredCoreEnv(c *corev1.Container) {
case "POSTGRES_HOST_PATH":
c.Env[j].Value = postgresSecretMountPath + "/host"
case "POSTGRES_CONNECTION_STRING_PATH":
c.Env[j].Value = postgresSecretMountPath + "/db_url"
if r.NooBaa.Spec.ExternalPgSecret != nil {
c.Env[j].Value = postgresSecretMountPath + "/db_url"
}

case "NODE_EXTRA_CA_CERTS":
c.Env[j].Value = r.ApplyCAsToPods
Expand Down