Skip to content

Commit af09366

Browse files
gkechhors
andauthored
K8SPSMDB-1256 refactor backup agent (pbm) mongo uri construction (#1835)
* K8SPSMDB-1256 refactor pbm mongo uri construction * cr: fix localhost, bring back port env usage and drop replicaset param from uri * add / to the uri before params * fix e2e-tests/data-at-rest-encryption * fix e2e-tests/demand-backup * fix e2e-tests/demand-backup-fs * fix e2e-tests/demand-backup-sharded * fix e2e-tests/liveness * fix e2e-tests/expose-sharded * fix e2e-tests/pitr-sharded * fix e2e-tests/pitr * fix e2e-tests/one-pod * fix e2e-tests/service-per-pod/ * fix e2e-tests/security-context/compare/statefulset_sec-context-rs0-changed.yml * fix e2e-tests/scheduled-backup * handle 1.20 uri --------- Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>
1 parent eef8680 commit af09366

File tree

65 files changed

+135
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+135
-78
lines changed

build/pbm-entry.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
#!/bin/bash
22

3-
PBM_MONGODB_URI="mongodb://${PBM_AGENT_MONGODB_USERNAME}:${PBM_AGENT_MONGODB_PASSWORD}@localhost:${PBM_MONGODB_PORT}/?replicaSet=${PBM_MONGODB_REPLSET}"
4-
53
if [[ -z ${PBM_AGENT_TLS_ENABLED} ]] || [[ ${PBM_AGENT_TLS_ENABLED} == "true" ]]; then
64
MONGO_SSL_DIR=/etc/mongodb-ssl
7-
if [[ -f "${MONGO_SSL_DIR}/tls.crt" ]] && [[ -f "${MONGO_SSL_DIR}/tls.key" ]]; then
8-
PBM_MONGODB_URI="${PBM_MONGODB_URI}&tls=true&tlsCertificateKeyFile=%2Ftmp%2Ftls.pem&tlsCAFile=${MONGO_SSL_DIR}%2Fca.crt&tlsInsecure=true"
5+
if [[ -e "${MONGO_SSL_DIR}/tls.crt" ]] && [[ -e "${MONGO_SSL_DIR}/tls.key" ]]; then
96
cat "${MONGO_SSL_DIR}/tls.key" "${MONGO_SSL_DIR}/tls.crt" >/tmp/tls.pem
107
fi
118
fi
129

13-
export PBM_MONGODB_URI
14-
1510
exec "$@"

e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ spec:
166166
apiVersion: v1
167167
fieldPath: metadata.name
168168
- name: PBM_MONGODB_URI
169-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
169+
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
170170
- name: PBM_AGENT_TLS_ENABLED
171171
value: "true"
172172
imagePullPolicy: Always

e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ spec:
167167
apiVersion: v1
168168
fieldPath: metadata.name
169169
- name: PBM_MONGODB_URI
170-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
170+
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
171171
- name: PBM_AGENT_TLS_ENABLED
172172
value: "true"
173173
imagePullPolicy: Always

e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ spec:
173173
apiVersion: v1
174174
fieldPath: metadata.name
175175
- name: PBM_MONGODB_URI
176-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
176+
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
177177
- name: PBM_AGENT_TLS_ENABLED
178178
value: "true"
179179
imagePullPolicy: Always

e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ spec:
174174
apiVersion: v1
175175
fieldPath: metadata.name
176176
- name: PBM_MONGODB_URI
177-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
177+
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
178178
- name: PBM_AGENT_TLS_ENABLED
179179
value: "true"
180180
imagePullPolicy: Always

e2e-tests/demand-backup-fs/compare/statefulset_some-name-rs0.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ spec:
182182
apiVersion: v1
183183
fieldPath: metadata.name
184184
- name: PBM_MONGODB_URI
185-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
185+
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
186186
- name: PBM_AGENT_TLS_ENABLED
187187
value: "true"
188188
imagePullPolicy: Always

e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-4-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ spec:
190190
apiVersion: v1
191191
fieldPath: metadata.name
192192
- name: PBM_MONGODB_URI
193-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
193+
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
194194
- name: PBM_AGENT_TLS_ENABLED
195195
value: "true"
196196
imagePullPolicy: Always

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ spec:
190190
apiVersion: v1
191191
fieldPath: metadata.name
192192
- name: PBM_MONGODB_URI
193-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
193+
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
194194
- name: PBM_AGENT_TLS_ENABLED
195195
value: "true"
196196
imagePullPolicy: Always

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ spec:
191191
apiVersion: v1
192192
fieldPath: metadata.name
193193
- name: PBM_MONGODB_URI
194-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
194+
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
195195
- name: PBM_AGENT_TLS_ENABLED
196196
value: "true"
197197
imagePullPolicy: Always

e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-4-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ spec:
175175
apiVersion: v1
176176
fieldPath: metadata.name
177177
- name: PBM_MONGODB_URI
178-
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
178+
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
179179
- name: PBM_AGENT_TLS_ENABLED
180180
value: "true"
181181
imagePullPolicy: Always

0 commit comments

Comments
 (0)