Skip to content

Commit ac860b4

Browse files
pooknullpooknull
committed
Merge remote-tracking branch 'origin/main' into K8SPSMDB-1285
2 parents be28372 + 03f78e5 commit ac860b4

File tree

59 files changed

+3679
-421
lines changed

Some content is hidden

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

59 files changed

+3679
-421
lines changed

‎cmd/mongodb-healthcheck/logger/logger.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"gopkg.in/natefinch/lumberjack.v2"
1414
"sigs.k8s.io/controller-runtime/pkg/log/zap"
1515

16-
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb"
16+
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/config"
1717
)
1818

1919
type Logger struct {
@@ -22,7 +22,7 @@ type Logger struct {
2222
}
2323

2424
func New() *Logger {
25-
logPath := filepath.Join(psmdb.MongodDataVolClaimName, "logs", "mongodb-healthcheck.log")
25+
logPath := filepath.Join(config.MongodDataVolClaimName, "logs", "mongodb-healthcheck.log")
2626

2727
return newLogger(logPath)
2828
}

‎deploy/bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19803,7 +19803,7 @@ spec:
1980319803
serviceAccountName: percona-server-mongodb-operator
1980419804
containers:
1980519805
- name: percona-server-mongodb-operator
19806-
image: perconalab/percona-server-mongodb-operator:main
19806+
image: percona/percona-server-mongodb-operator:1.20.0
1980719807
imagePullPolicy: Always
1980819808
livenessProbe:
1980919809
failureThreshold: 3

‎deploy/cr-minimal.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: minimal-cluster
55
spec:
66
crVersion: 1.20.0
7-
image: perconalab/percona-server-mongodb-operator:main-mongod8.0
7+
image: percona/percona-server-mongodb:7.0.18-11
88
unsafeFlags:
99
replsetSize: true
1010
mongosSize: true

‎deploy/cr.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
# unmanaged: false
1515
# enableVolumeExpansion: false
1616
crVersion: 1.20.0
17-
image: perconalab/percona-server-mongodb-operator:main-mongod8.0
17+
image: percona/percona-server-mongodb:7.0.18-11
1818
imagePullPolicy: Always
1919
# tls:
2020
# mode: preferTLS
@@ -27,7 +27,7 @@ spec:
2727
# group: cert-manager.io
2828
# imagePullSecrets:
2929
# - name: private-registry-credentials
30-
# initImage: perconalab/percona-server-mongodb-operator:main
30+
# initImage: percona/percona-server-mongodb-operator:1.20.0
3131
# initContainerSecurityContext: {}
3232
# unsafeFlags:
3333
# tls: false
@@ -59,7 +59,7 @@ spec:
5959
# sse: my-cluster-name-sse
6060
pmm:
6161
enabled: false
62-
image: perconalab/pmm-client:dev-latest
62+
image: percona/pmm-client:2.44.1
6363
serverHost: monitoring-service
6464
# containerSecurityContext: {}
6565
# customClusterName: mongo-cluster
@@ -622,7 +622,7 @@ spec:
622622

623623
backup:
624624
enabled: true
625-
image: perconalab/percona-server-mongodb-operator:main-backup
625+
image: percona/percona-backup-mongodb:2.9.1
626626
# annotations:
627627
# iam.amazonaws.com/role: role-arn
628628
# resources:

‎deploy/cw-bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19824,7 +19824,7 @@ spec:
1982419824
serviceAccountName: percona-server-mongodb-operator
1982519825
containers:
1982619826
- name: percona-server-mongodb-operator
19827-
image: perconalab/percona-server-mongodb-operator:main
19827+
image: percona/percona-server-mongodb-operator:1.20.0
1982819828
imagePullPolicy: Always
1982919829
livenessProbe:
1983019830
failureThreshold: 3

‎deploy/cw-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: percona-server-mongodb-operator
1616
containers:
1717
- name: percona-server-mongodb-operator
18-
image: perconalab/percona-server-mongodb-operator:main
18+
image: percona/percona-server-mongodb-operator:1.20.0
1919
imagePullPolicy: Always
2020
livenessProbe:
2121
failureThreshold: 3

‎deploy/operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: percona-server-mongodb-operator
1616
containers:
1717
- name: percona-server-mongodb-operator
18-
image: perconalab/percona-server-mongodb-operator:main
18+
image: percona/percona-server-mongodb-operator:1.20.0
1919
imagePullPolicy: Always
2020
livenessProbe:
2121
failureThreshold: 3

‎deploy/secrets.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ stringData:
1717
PMM_SERVER_API_KEY: apikey
1818
#PMM_SERVER_USER: admin
1919
#PMM_SERVER_PASSWORD: admin
20+
#PMM_SERVER_TOKEN: token

‎e2e-tests/balancer/conf/some-name-rs0.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ spec:
5555
persistentVolumeClaim:
5656
resources:
5757
requests:
58-
storage: 1Gi
58+
storage: 3Gi
5959
size: 3
6060
- name: rs1
6161
affinity:
@@ -73,7 +73,7 @@ spec:
7373
persistentVolumeClaim:
7474
resources:
7575
requests:
76-
storage: 1Gi
76+
storage: 3Gi
7777
size: 3
7878
- name: rs2
7979
affinity:
@@ -91,7 +91,7 @@ spec:
9191
persistentVolumeClaim:
9292
resources:
9393
requests:
94-
storage: 1Gi
94+
storage: 3Gi
9595
size: 3
9696
secrets:
9797
users: some-users

‎e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg-oc.yml

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

‎e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg.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/default-cr/compare/statefulset_my-cluster-name-rs0-oc.yml

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

‎e2e-tests/default-cr/compare/statefulset_my-cluster-name-rs0.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/default-cr/run

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -91,33 +91,6 @@ function main() {
9191
compare_generation "1" "statefulset" "${cluster}-mongos"
9292
compare_generation "1" "psmdb" "${cluster}"
9393

94-
desc 'install PMM Server'
95-
deploy_pmm_server
96-
sleep 20
97-
kubectl_bin patch psmdb ${cluster} --type=merge --patch '{
98-
"spec": {"pmm":{"enabled":true}}
99-
}'
100-
sleep 120
101-
# since psmdb cluster won't work without pmm server running consistency check would be enough
102-
wait_cluster_consistency $cluster
103-
104-
kubectl_bin patch psmdb ${cluster} --type=merge --patch '{
105-
"spec": {"pmm":{"enabled":false}}
106-
}'
107-
sleep 120
108-
109-
if [[ -n ${OPENSHIFT} ]]; then
110-
oc adm policy remove-scc-from-user privileged -z pmm-server
111-
if [ -n "$OPERATOR_NS" ]; then
112-
oc delete clusterrolebinding pmm-psmdb-operator-cluster-wide
113-
else
114-
oc delete rolebinding pmm-psmdb-operator-namespace-only
115-
fi
116-
fi
117-
helm uninstall monitoring
118-
119-
wait_cluster_consistency $cluster
120-
12194
desc 'enabling arbiter'
12295
kubectl_bin patch psmdb ${cluster} --type json -p='[{"op":"replace","path":"/spec/replsets/0/arbiter/enabled","value":true},{"op":"replace","path":"/spec/replsets/0/size","value":4}]'
12396
wait_cluster_consistency $cluster

‎e2e-tests/demand-backup-eks-credentials-irsa/compare/statefulset_some-name-rs0.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/demand-backup-incremental-sharded/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ run_recovery_check() {
5656
fi
5757
echo
5858

59-
wait_cluster_consistency ${cluster} 42
59+
wait_cluster_consistency ${cluster} 60
6060
wait_for_pbm_operations ${cluster}
6161

6262
if [[ $base == true ]]; then

‎e2e-tests/demand-backup-sharded/run

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,18 @@ fi
148148

149149
desc 'check backup and restore -- minio'
150150
backup_dest_minio=$(get_backup_dest "$backup_name_minio")
151-
kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \
151+
retry=0
152+
until kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \
152153
/usr/bin/env AWS_ACCESS_KEY_ID=some-access-key AWS_SECRET_ACCESS_KEY=some-secret-key AWS_DEFAULT_REGION=us-east-1 \
153154
/usr/bin/aws --endpoint-url http://minio-service:9000 s3 ls "s3://${backup_dest_minio}/rs0/" \
154-
| grep "myApp.test.gz"
155+
| grep "myApp.test.gz"; do
156+
sleep 1
157+
let retry+=1
158+
if [ $retry -ge 60 ]; then
159+
echo "Max retry count $retry reached. Something went wrong with writing backup"
160+
exit 1
161+
fi
162+
done
155163
insert_data_mongos "100501" "myApp" "" "$custom_port"
156164
insert_data_mongos "100501" "myApp1" "" "$custom_port"
157165
insert_data_mongos "100501" "myApp2" "" "$custom_port"

0 commit comments

Comments
 (0)