Skip to content

K8SPSMDB-1172: fix special chars in backup user/password #1699

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

Closed
pooknull wants to merge 14 commits into from
Closed

K8SPSMDB-1172: fix special chars in backup user/password #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
856a3b1
K8SPSMDB-1172: fix special chars in backup user/password
pooknull Nov 4, 2024
4d2e269
fix users test
pooknull Nov 6, 2024
81be6c8
fix physical restore
pooknull Nov 6, 2024
225f7bd
fix tests
pooknull Nov 6, 2024
1b3a450
fix physical restore
pooknull Nov 7, 2024
b6d0905
fix pitr tests
pooknull Nov 7, 2024
29815dc
Merge branch 'main' into dev/K8SPSMDB-1172
pooknull Nov 8, 2024
b1edee0
fix custom-replset-namme
pooknull Nov 8, 2024
2eb716e
fix users test
pooknull Nov 11, 2024
09df28c
Merge remote-tracking branch 'origin/main' into dev/K8SPSMDB-1172
pooknull Nov 12, 2024
72640cf
fix tests
pooknull Nov 12, 2024
52c0a48
fix
pooknull Nov 12, 2024
308801d
fix test
pooknull Nov 13, 2024
0b50488
Merge branch 'main' into dev/K8SPSMDB-1172
nmarukovich Nov 18, 2024
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
20 changes: 14 additions & 6 deletions build/pbm-entry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
#!/bin/bash

PBM_MONGODB_URI="mongodb://${PBM_AGENT_MONGODB_USERNAME}:${PBM_AGENT_MONGODB_PASSWORD}@localhost:${PBM_MONGODB_PORT}/?replicaSet=${PBM_MONGODB_REPLSET}"
function urlencode {
uri="$1"
echo -n "$uri" | jq -s -R -r @uri
}

if [[ -z ${PBM_AGENT_TLS_ENABLED} ]] || [[ ${PBM_AGENT_TLS_ENABLED} == "true" ]]; then
MONGO_SSL_DIR=/etc/mongodb-ssl
if [[ -f "${MONGO_SSL_DIR}/tls.crt" ]] && [[ -f "${MONGO_SSL_DIR}/tls.key" ]]; then
PBM_MONGODB_URI="${PBM_MONGODB_URI}&tls=true&tlsCertificateKeyFile=%2Ftmp%2Ftls.pem&tlsCAFile=${MONGO_SSL_DIR}%2Fca.crt&tlsInsecure=true"
cat "${MONGO_SSL_DIR}/tls.key" "${MONGO_SSL_DIR}/tls.crt" >/tmp/tls.pem
if [[ -z $POD_NAME ]]; then
PBM_MONGODB_URI="mongodb://$(urlencode "$PBM_AGENT_MONGODB_USERNAME"):$(urlencode "$PBM_AGENT_MONGODB_PASSWORD")@localhost:${PBM_MONGODB_PORT}/?replicaSet=${PBM_MONGODB_REPLSET}"
if [[ -z ${PBM_AGENT_TLS_ENABLED} ]] || [[ ${PBM_AGENT_TLS_ENABLED} == "true" ]]; then
MONGO_SSL_DIR=/etc/mongodb-ssl
if [[ -f "${MONGO_SSL_DIR}/tls.crt" ]] && [[ -f "${MONGO_SSL_DIR}/tls.key" ]]; then
PBM_MONGODB_URI="${PBM_MONGODB_URI}&tls=true&tlsCertificateKeyFile=%2Ftmp%2Ftls.pem&tlsCAFile=${MONGO_SSL_DIR}%2Fca.crt&tlsInsecure=true"
cat "${MONGO_SSL_DIR}/tls.key" "${MONGO_SSL_DIR}/tls.crt" >/tmp/tls.pem
fi
fi
else
PBM_MONGODB_URI="mongodb://$(urlencode "$PBM_AGENT_MONGODB_USERNAME"):$(urlencode "$PBM_AGENT_MONGODB_PASSWORD")@$POD_NAME"
fi

export PBM_MONGODB_URI
Expand Down
2 changes: 1 addition & 1 deletion build/physical-restore-ps-entry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ log=/tmp/pbm-agent.log

touch /opt/percona/restore-in-progress

/opt/percona/pbm-agent 1>&2 2>${log} &
/opt/percona/pbm-entry.sh /opt/percona/pbm-agent 1>&2 2>${log} &
/opt/percona/ps-entry.sh "$@" 1>&2 2>/tmp/mongod.log

echo "Physical restore in progress"
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/conf/secrets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ metadata:
name: some-users
type: Opaque
data:
MONGODB_BACKUP_USER: YmFja3Vw
MONGODB_BACKUP_PASSWORD: YmFja3VwMTIzNDU2
MONGODB_BACKUP_USER: YmFja3VwJCMl
MONGODB_BACKUP_PASSWORD: YmFja3VwMTIzNDU2Iw==
MONGODB_DATABASE_ADMIN_USER: ZGF0YWJhc2VBZG1pbg==
MONGODB_DATABASE_ADMIN_PASSWORD: ZGF0YWJhc2VBZG1pbjEyMzQ1Ng==
MONGODB_USER_ADMIN_USER: dXNlckFkbWlu
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/custom-replset-name/conf/some-name.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: PerconaServerMongoDB
metadata:
name: some-name
spec:
crVersion: 1.16.0
crVersion: 1.18.0
backup:
enabled: true
image: percona/percona-backup-mongodb:2.0.4
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-eks-credentials/compare/statefulset_some-name-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-fs/compare/statefulset_some-name-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
5 changes: 2 additions & 3 deletions e2e-tests/demand-backup-fs/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ run_recovery_check() {

get_latest_oplog_chunk_ts() {
local cluster=$1
echo $(kubectl_bin exec ${cluster}-rs0-0 -c backup-agent -- pbm status -o json | jq '.backups.pitrChunks.pitrChunks | last | .range.end')
echo $(kubectl_bin exec ${cluster}-rs0-0 -c backup-agent -- /opt/percona/pbm-entry.sh pbm status -o json | jq '.backups.pitrChunks.pitrChunks | last | .range.end')
}

format_date() {
Expand All @@ -46,7 +46,7 @@ format_date() {
wait_for_oplogs() {
local cluster1=$1

local backup_last_write=$(kubectl_bin exec ${cluster}-rs0-0 -c backup-agent -- pbm status -o json | jq .backups.snapshot[0].restoreTo)
local backup_last_write=$(kubectl_bin exec ${cluster}-rs0-0 -c backup-agent -- /opt/percona/pbm-entry.sh pbm status -o json | jq .backups.snapshot[0].restoreTo)

local retries=0
local last_chunk=$(get_latest_oplog_chunk_ts ${cluster})
Expand Down Expand Up @@ -94,7 +94,6 @@ write_data() {
compare_mongo_cmd "find" "myApp:myPass@${cluster}-rs0.${namespace}" "${find_prefix}" ".svc.cluster.local" "myApp" "test"
}


cluster="some-name"

create_infra ${namespace}
Expand Down
2 changes: 0 additions & 2 deletions ...s/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
envFrom:
- secretRef:
name: internal-some-name-users
Expand Down
2 changes: 0 additions & 2 deletions ...ests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
envFrom:
- secretRef:
name: internal-some-name-users
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
envFrom:
- secretRef:
name: internal-some-name-users
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
envFrom:
- secretRef:
name: internal-some-name-users
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
envFrom:
- secretRef:
name: internal-some-name-users
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
envFrom:
- secretRef:
name: internal-some-name-users
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-4-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-cfg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-4-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs1-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs2-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup-sharded/compare/statefulset_some-name-rs2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup/compare/statefulset_some-name-rs0-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/demand-backup/compare/statefulset_some-name-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
12 changes: 8 additions & 4 deletions e2e-tests/functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ wait_for_pbm_operations() {
set +o xtrace
echo -n "waiting for PBM operation to finish"
retry=0
until [[ $(kubectl_bin exec ${cluster}-rs0-0 -c backup-agent -- pbm status -o json -s running | jq -r .running.opID) == null ]]; do
until [[ $(kubectl_bin exec ${cluster}-rs0-0 -c backup-agent -- /opt/percona/pbm-entry.sh pbm status -o json -s running | jq -r .running.opID) == null ]]; do
if [ $retry -ge 540 ]; then
echo max retry count $retry reached. something went wrong with PBM operations
exit 1
Expand All @@ -262,7 +262,6 @@ wait_for_pbm_operations() {
set_debug
}


run_restore() {
local backup_name=$1

Expand Down Expand Up @@ -1189,6 +1188,11 @@ getSecretData() {
echo "$data"
}

function urlencode {
uri="$1"
echo -n "$uri" | jq -s -R -r @uri
}

check_mongo_auth() {
local uri="$1"

Expand Down Expand Up @@ -1517,10 +1521,10 @@ get_latest_restorable_time() {
# "pbm-agent status" can return different timestamp in first few seconds
# we need to get it twice to be sure that timestamp was not changed
until [[ $first_timestamp != "" && $first_timestamp != "null" && $first_timestamp == $second_timestamp ]]; do
first_timestamp=$(kubectl_bin exec "$cluster-0" -c backup-agent -- pbm status -o json | jq '.backups.pitrChunks.pitrChunks | last | .range.end')
first_timestamp=$(kubectl_bin exec "$cluster-0" -c backup-agent -- /opt/percona/pbm-entry.sh pbm status -o json | jq '.backups.pitrChunks.pitrChunks | last | .range.end')
sleep 5
if [[ $first_timestamp != "" && $first_timestamp != "null" ]]; then
second_timestamp=$(kubectl_bin exec "$cluster-0" -c backup-agent -- pbm status -o json | jq '.backups.pitrChunks.pitrChunks | last | .range.end')
second_timestamp=$(kubectl_bin exec "$cluster-0" -c backup-agent -- /opt/percona/pbm-entry.sh pbm status -o json | jq '.backups.pitrChunks.pitrChunks | last | .range.end')
fi
let retry+=1
if [[ $retry -gt 30 ]]; then
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/liveness/compare/statefulset_liveness-rs0-changed-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
2 changes: 0 additions & 2 deletions e2e-tests/liveness/compare/statefulset_liveness-rs0-changed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: PBM_MONGODB_URI
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
- name: PBM_AGENT_TLS_ENABLED
value: "true"
imagePullPolicy: Always
Expand Down
Loading
Loading