Skip to content

Commit fd8c741

Browse files
committed
Merge remote-tracking branch 'origin/main' into K8SPSMDB-1211
2 parents 6995236 + 2a08f7a commit fd8c741

File tree

28 files changed

+287
-31
lines changed

28 files changed

+287
-31
lines changed

build/physical-restore-ps-entry.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ trap 'handle_sigterm' 15
2121

2222
touch /opt/percona/restore-in-progress
2323

24+
if [[ -z ${PBM_AGENT_TLS_ENABLED} ]] || [[ ${PBM_AGENT_TLS_ENABLED} == "true" ]]; then
25+
MONGO_SSL_DIR=/etc/mongodb-ssl
26+
if [[ -e "${MONGO_SSL_DIR}/tls.crt" ]] && [[ -e "${MONGO_SSL_DIR}/tls.key" ]]; then
27+
cat "${MONGO_SSL_DIR}/tls.key" "${MONGO_SSL_DIR}/tls.crt" >/tmp/tls.pem
28+
fi
29+
fi
30+
2431
/opt/percona/pbm-agent >${PBM_AGENT_LOG} 2>&1 &
2532
pbm_pid=$!
2633

e2e-tests/demand-backup-incremental-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,17 @@ spec:
8484
value: "true"
8585
- name: PBM_AGENT_SIDECAR_SLEEP
8686
value: "5"
87+
- name: PBM_AGENT_TLS_ENABLED
88+
value: "true"
89+
- name: PBM_MONGODB_PORT
90+
value: "27017"
8791
- name: POD_NAME
8892
valueFrom:
8993
fieldRef:
9094
apiVersion: v1
9195
fieldPath: metadata.name
9296
- name: PBM_MONGODB_URI
93-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
97+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9498
envFrom:
9599
- secretRef:
96100
name: internal-some-name-users

e2e-tests/demand-backup-incremental-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,17 @@ spec:
8484
value: "true"
8585
- name: PBM_AGENT_SIDECAR_SLEEP
8686
value: "5"
87+
- name: PBM_AGENT_TLS_ENABLED
88+
value: "true"
89+
- name: PBM_MONGODB_PORT
90+
value: "27017"
8791
- name: POD_NAME
8892
valueFrom:
8993
fieldRef:
9094
apiVersion: v1
9195
fieldPath: metadata.name
9296
- name: PBM_MONGODB_URI
93-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
97+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9498
envFrom:
9599
- secretRef:
96100
name: internal-some-name-users

e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore-oc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-incremental/compare/statefulset_some-name-rs0_restore.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-aws/compare/statefulset_some-name-rs0_restore-oc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-aws/compare/statefulset_some-name-rs0_restore.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-azure/compare/statefulset_some-name-rs0_restore-oc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-azure/compare/statefulset_some-name-rs0_restore.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-gcp/compare/statefulset_some-name-rs0_restore-oc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-gcp/compare/statefulset_some-name-rs0_restore.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore-oc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-minio/compare/statefulset_some-name-rs0_restore.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ spec:
8383
value: "true"
8484
- name: PBM_AGENT_SIDECAR_SLEEP
8585
value: "5"
86+
- name: PBM_AGENT_TLS_ENABLED
87+
value: "true"
88+
- name: PBM_MONGODB_PORT
89+
value: "27017"
8690
- name: POD_NAME
8791
valueFrom:
8892
fieldRef:
8993
apiVersion: v1
9094
fieldPath: metadata.name
9195
- name: PBM_MONGODB_URI
92-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
96+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9397
envFrom:
9498
- secretRef:
9599
name: internal-some-name-users

e2e-tests/demand-backup-physical-sharded-aws/compare/statefulset_some-name-rs0_restore_sharded.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,17 @@ spec:
8484
value: "true"
8585
- name: PBM_AGENT_SIDECAR_SLEEP
8686
value: "5"
87+
- name: PBM_AGENT_TLS_ENABLED
88+
value: "true"
89+
- name: PBM_MONGODB_PORT
90+
value: "27017"
8791
- name: POD_NAME
8892
valueFrom:
8993
fieldRef:
9094
apiVersion: v1
9195
fieldPath: metadata.name
9296
- name: PBM_MONGODB_URI
93-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
97+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9498
envFrom:
9599
- secretRef:
96100
name: internal-some-name-users

e2e-tests/demand-backup-physical-sharded-azure/compare/statefulset_some-name-rs0_restore_sharded-oc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,17 @@ spec:
8484
value: "true"
8585
- name: PBM_AGENT_SIDECAR_SLEEP
8686
value: "5"
87+
- name: PBM_AGENT_TLS_ENABLED
88+
value: "true"
89+
- name: PBM_MONGODB_PORT
90+
value: "27017"
8791
- name: POD_NAME
8892
valueFrom:
8993
fieldRef:
9094
apiVersion: v1
9195
fieldPath: metadata.name
9296
- name: PBM_MONGODB_URI
93-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
97+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9498
envFrom:
9599
- secretRef:
96100
name: internal-some-name-users

e2e-tests/demand-backup-physical-sharded-azure/compare/statefulset_some-name-rs0_restore_sharded.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,17 @@ spec:
8484
value: "true"
8585
- name: PBM_AGENT_SIDECAR_SLEEP
8686
value: "5"
87+
- name: PBM_AGENT_TLS_ENABLED
88+
value: "true"
89+
- name: PBM_MONGODB_PORT
90+
value: "27017"
8791
- name: POD_NAME
8892
valueFrom:
8993
fieldRef:
9094
apiVersion: v1
9195
fieldPath: metadata.name
9296
- name: PBM_MONGODB_URI
93-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
97+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9498
envFrom:
9599
- secretRef:
96100
name: internal-some-name-users

e2e-tests/demand-backup-physical-sharded-gcp/compare/statefulset_some-name-rs0_restore_sharded-oc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,17 @@ spec:
8484
value: "true"
8585
- name: PBM_AGENT_SIDECAR_SLEEP
8686
value: "5"
87+
- name: PBM_AGENT_TLS_ENABLED
88+
value: "true"
89+
- name: PBM_MONGODB_PORT
90+
value: "27017"
8791
- name: POD_NAME
8892
valueFrom:
8993
fieldRef:
9094
apiVersion: v1
9195
fieldPath: metadata.name
9296
- name: PBM_MONGODB_URI
93-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
97+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)/?tls=true&tlsCertificateKeyFile=/tmp/tls.pem&tlsCAFile=/etc/mongodb-ssl/ca.crt&tlsInsecure=true
9498
envFrom:
9599
- secretRef:
96100
name: internal-some-name-users

0 commit comments

Comments
 (0)