Skip to content

Commit eda57dc

Browse files
authored
K8SPSMDB-1481 - Update release versions file and fix tests (#2088)
* Update release versions file * Update PMM in cr and tests * Update gke k8s version * Fix tests * fix more tests * Increase pmm instalation waiting time * More test fixes * Update gke ver * Fix init-deploy compare file * more fixes
1 parent 5fb2cda commit eda57dc

File tree

18 files changed

+637
-48
lines changed

18 files changed

+637
-48
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void createCluster(String CLUSTER_SUFFIX) {
1313
gcloud auth activate-service-account --key-file $CLIENT_SECRET_FILE
1414
gcloud config set project $GCP_PROJECT
1515
gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true
16-
gcloud container clusters create --zone $region $CLUSTER_NAME-${CLUSTER_SUFFIX} --cluster-version=1.30 --machine-type=n1-standard-4 --preemptible --disk-size 30 --num-nodes=\$NODES_NUM --network=jenkins-vpc --subnetwork=jenkins-${CLUSTER_SUFFIX} --no-enable-autoupgrade --cluster-ipv4-cidr=/21 --labels delete-cluster-after-hours=6 --enable-ip-alias --workload-pool=cloud-dev-112233.svc.id.goog && \
16+
gcloud container clusters create --zone $region $CLUSTER_NAME-${CLUSTER_SUFFIX} --cluster-version=1.31 --machine-type=n1-standard-4 --preemptible --disk-size 30 --num-nodes=\$NODES_NUM --network=jenkins-vpc --subnetwork=jenkins-${CLUSTER_SUFFIX} --no-enable-autoupgrade --cluster-ipv4-cidr=/21 --labels delete-cluster-after-hours=6 --enable-ip-alias --workload-pool=cloud-dev-112233.svc.id.goog && \
1717
kubectl create clusterrolebinding cluster-admin-binding --clusterrole cluster-admin --user jenkins@"$GCP_PROJECT".iam.gserviceaccount.com || ret_val=\$?
1818
if [ \${ret_val} -eq 0 ]; then break; fi
1919
ret_num=\$((ret_num + 1))

deploy/cr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
# sse: my-cluster-name-sse
6161
pmm:
6262
enabled: false
63-
image: percona/pmm-client:3.4.0
63+
image: percona/pmm-client:3.4.1
6464
serverHost: monitoring-service
6565
# containerSecurityContext: {}
6666
# customClusterName: mongo-cluster

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ spec:
112112
timeoutSeconds: 2
113113
resources:
114114
limits:
115-
cpu: 300m
116-
memory: 500M
115+
cpu: 600m
116+
memory: 1Gi
117117
requests:
118118
cpu: 300m
119-
memory: 500M
119+
memory: 1Gi
120120
securityContext:
121121
runAsNonRoot: true
122122
terminationMessagePath: /dev/termination-log
@@ -265,11 +265,11 @@ spec:
265265
name: mongo-init
266266
resources:
267267
limits:
268-
cpu: 300m
269-
memory: 500M
268+
cpu: 600m
269+
memory: 1Gi
270270
requests:
271271
cpu: 300m
272-
memory: 500M
272+
memory: 1Gi
273273
terminationMessagePath: /dev/termination-log
274274
terminationMessagePolicy: File
275275
volumeMounts:

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ spec:
112112
timeoutSeconds: 2
113113
resources:
114114
limits:
115-
cpu: 300m
116-
memory: 500M
115+
cpu: 600m
116+
memory: 1Gi
117117
requests:
118118
cpu: 300m
119-
memory: 500M
119+
memory: 1Gi
120120
securityContext:
121121
runAsNonRoot: true
122122
terminationMessagePath: /dev/termination-log
@@ -236,13 +236,13 @@ spec:
236236
valueFrom:
237237
secretKeyRef:
238238
key: MONGODB_CLUSTER_ADMIN_USER_ESCAPED
239-
name: internal-another-name-users
239+
name: internal-my-cluster-name-users
240240
optional: false
241241
- name: MONGODB_PASSWORD
242242
valueFrom:
243243
secretKeyRef:
244244
key: MONGODB_CLUSTER_ADMIN_PASSWORD_ESCAPED
245-
name: internal-another-name-users
245+
name: internal-my-cluster-name-users
246246
optional: false
247247
imagePullPolicy: IfNotPresent
248248
name: logrotate
@@ -265,11 +265,11 @@ spec:
265265
name: mongo-init
266266
resources:
267267
limits:
268-
cpu: 300m
269-
memory: 500M
268+
cpu: 600m
269+
memory: 1Gi
270270
requests:
271271
cpu: 300m
272-
memory: 500M
272+
memory: 1Gi
273273
terminationMessagePath: /dev/termination-log
274274
terminationMessagePolicy: File
275275
volumeMounts:

e2e-tests/demand-backup-if-unhealthy/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ wait_for_cluster_state "$cluster" "initializing|error"
146146

147147
backup_name_minio="backup-minio-$type"
148148
run_backup "minio" "$backup_name_minio" "$type"
149-
wait_backup $backup_name_minio running
149+
#wait_backup $backup_name_minio running #disabling this check temporarily as backup can be very fast in some platforms
150150
verify_sts_not_ready
151151
wait_for_cluster_state "$cluster" "initializing|error"
152152

e2e-tests/demand-backup-physical-sharded-aws/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/functions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ SKIP_BACKUPS_TO_AWS_GCP_AZURE=${SKIP_BACKUPS_TO_AWS_GCP_AZURE:-1}
1515
PMM_SERVER_VER=${PMM_SERVER_VER:-"9.9.9"}
1616
IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"percona/pmm-client:2.44.1-1"}
1717
IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
18-
IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3.4.0"}
19-
IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3.4.0"}
18+
IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3.4.1"}
19+
IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3.4.1"}
2020
CERT_MANAGER_VER="1.18.2"
2121
MINIO_VER="5.4.0"
2222
CHAOS_MESH_VER="2.7.1"

e2e-tests/init-deploy/compare/backup-80.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,7 @@
449449
"cluster": true
450450
},
451451
"actions": [
452+
"listClusterCatalog",
452453
"allCollectionStats",
453454
"appendOplogNote",
454455
"bypassWriteBlockingMode",

e2e-tests/init-deploy/compare/clusterAdmin-80.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@
260260
},
261261
"actions": [
262262
"addShard",
263+
"listClusterCatalog",
263264
"allCollectionStats",
264265
"appendOplogNote",
265266
"applicationMessage",

e2e-tests/init-deploy/compare/clusterMonitor-80.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@
198198
"cluster": true
199199
},
200200
"actions": [
201+
"listClusterCatalog",
201202
"allCollectionStats",
202203
"connPoolStats",
203204
"getDefaultRWConcern",

0 commit comments

Comments
 (0)