Skip to content

Commit 56f748d

Browse files
Add missing envs for external pg db
Signed-off-by: Anisur Rahman <[email protected]>
1 parent a26fdde commit 56f748d

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ build-releases/
1616
noobaa.cfg.yaml
1717

1818
*.IGNORE
19+
.idea/

deploy/internal/deployment-endpoint.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ spec:
127127
- name: POSTGRES_PASSWORD_PATH
128128
- name: POSTGRES_DBNAME_PATH
129129
- name: POSTGRES_PORT_PATH
130+
- name: POSTGRES_CONNECTION_STRING_PATH
130131
- name: VIRTUAL_HOSTS
131132
- name: REGION
132133
- name: ENDPOINT_GROUP_ID

deploy/internal/statefulset-core.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ spec:
131131
- name: POSTGRES_PASSWORD_PATH
132132
- name: POSTGRES_DBNAME_PATH
133133
- name: POSTGRES_PORT_PATH
134+
- name: POSTGRES_CONNECTION_STRING_PATH
134135
- name: GUARANTEED_LOGS_PATH
135136
- name: DB_TYPE
136137
value: postgres

pkg/bundle/deploy.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3979,7 +3979,7 @@ data:
39793979
shared_preload_libraries = 'pg_stat_statements'
39803980
`
39813981

3982-
const Sha256_deploy_internal_deployment_endpoint_yaml = "4221668694225599735ba859f68e47a9de8ce1aca685e0acd266c80e338bbda5"
3982+
const Sha256_deploy_internal_deployment_endpoint_yaml = "0a731c7ead9a584d6336eceb238375c21dbe42abb1de19ac46d6d03e657473e4"
39833983

39843984
const File_deploy_internal_deployment_endpoint_yaml = `apiVersion: apps/v1
39853985
kind: Deployment
@@ -4110,6 +4110,7 @@ spec:
41104110
- name: POSTGRES_PASSWORD_PATH
41114111
- name: POSTGRES_DBNAME_PATH
41124112
- name: POSTGRES_PORT_PATH
4113+
- name: POSTGRES_CONNECTION_STRING_PATH
41134114
- name: VIRTUAL_HOSTS
41144115
- name: REGION
41154116
- name: ENDPOINT_GROUP_ID
@@ -5088,7 +5089,7 @@ spec:
50885089
noobaa-s3-svc: "true"
50895090
`
50905091

5091-
const Sha256_deploy_internal_statefulset_core_yaml = "34da89373b8398adb670d779a35f5c5a94365da99b5a2db65715fd62a7638d5c"
5092+
const Sha256_deploy_internal_statefulset_core_yaml = "5729a3874016bafa694d55f6347077c9b528d99abd61c2c321b20176846cfaab"
50925093

50935094
const File_deploy_internal_statefulset_core_yaml = `apiVersion: apps/v1
50945095
kind: StatefulSet
@@ -5223,6 +5224,7 @@ spec:
52235224
- name: POSTGRES_PASSWORD_PATH
52245225
- name: POSTGRES_DBNAME_PATH
52255226
- name: POSTGRES_PORT_PATH
5227+
- name: POSTGRES_CONNECTION_STRING_PATH
52265228
- name: GUARANTEED_LOGS_PATH
52275229
- name: DB_TYPE
52285230
value: postgres

pkg/system/phase2_creating.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,9 @@ func (r *Reconciler) setDesiredCoreEnv(c *corev1.Container) {
487487
case "POSTGRES_HOST_PATH":
488488
c.Env[j].Value = postgresSecretMountPath + "/host"
489489
case "POSTGRES_CONNECTION_STRING_PATH":
490-
c.Env[j].Value = postgresSecretMountPath + "/db_url"
490+
if r.NooBaa.Spec.ExternalPgSecret != nil {
491+
c.Env[j].Value = postgresSecretMountPath + "/db_url"
492+
}
491493

492494
case "NODE_EXTRA_CA_CERTS":
493495
c.Env[j].Value = r.ApplyCAsToPods

0 commit comments

Comments
 (0)