K8SPSMDB-1481 - Release 1.21.0

Makefile

@@ -118,11 +118,13 @@ release: manifests
 		-e "/^spec:/,/^  image:/{s#image: .*#image: $(IMAGE_MONGOD80)#}" \
 		-e "/^  backup:/,/^    image:/{s#image: .*#image: $(IMAGE_BACKUP)#}" \
 		-e "s#initImage: .*#initImage: percona/percona-server-mongodb-operator:$(VERSION)#g" \
-		-e "/^  pmm:/,/^    image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" deploy/cr.yaml
+		-e "/^  logcollector:/,/^    image:/{s#image: .*#image: $(IMAGE_LOGCOLLECTOR)#}" \
+		-e "/^  pmm:/,/^    image:/{s#image: .*#image: $(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
 	$(SED) -i \
 		-e "s|perconalab/percona-server-mongodb-operator:main-mongod8.0|$(IMAGE_MONGOD80)|g" \
 		-e "s|perconalab/percona-server-mongodb-operator:main-backup|$(IMAGE_BACKUP)|g" \
 		-e "s|perconalab/percona-server-mongodb-operator:main|$(IMAGE_OPERATOR)|g" \
+		-e "s|perconalab/fluentbit:main-logcollector|$(IMAGE_LOGCOLLECTOR)|g" \
 		pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
 	$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"${IMAGE_OPERATOR}\"|g" pkg/controller/perconaservermongodb/suite_test.go
 
@@ -132,7 +134,7 @@ MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[
 MINOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f2)
 NEXT_VER ?= $(MAJOR_VER).$$(($(MINOR_VER) + 1)).0
 after-release: manifests
-	$(SED) -i "/Version = \"/s/Version = \".*/Version = \"$(NEXT_VER)\"/" version/version.go
+	echo $(NEXT_VER) > pkg/version/version.txt
 	$(SED) -i \
 		-e "s/crVersion: .*/crVersion: $(NEXT_VER)/" \
 		-e "/^spec:/,/^  image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod8.0#}" deploy/cr-minimal.yaml
@@ -141,11 +143,13 @@ after-release: manifests
 		-e "/^spec:/,/^  image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod8.0#}" \
 		-e "/^  backup:/,/^    image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-backup#}" \
 		-e "s#initImage: .*#initImage: perconalab/percona-server-mongodb-operator:main#g" \
-		-e "/^  pmm:/,/^    image:/{s#image: .*#image: perconalab/pmm-client:dev-latest#}" deploy/cr.yaml
+		-e "/^  logcollector:/,/^    image:/{s#image: .*#image: perconalab/fluentbit:main-logcollector#}" \
+		-e "/^  pmm:/,/^    image:/{s#image: .*#image: perconalab/pmm-client:3-dev-latest#}" deploy/cr.yaml
 	$(SED) -i \
 		-e "s|$(IMAGE_MONGOD80)|perconalab/percona-server-mongodb-operator:main-mongod8.0|g" \
 		-e "s|$(IMAGE_BACKUP)|perconalab/percona-server-mongodb-operator:main-backup|g" \
 		-e "s|$(IMAGE_OPERATOR)|perconalab/percona-server-mongodb-operator:main|g" \
+		-e "s|$(IMAGE_LOGCOLLECTOR)|perconalab/fluentbit:main-logcollector|g" \
 		pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
 	$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"perconalab/percona-server-mongodb-operator:main\"|g" pkg/controller/perconaservermongodb/suite_test.go
 

config/crd/patches/versionlabel_in_psmdb.yaml

@@ -4,6 +4,6 @@ metadata:
   name: perconaservermongodbs.psmdb.percona.com
   labels:
     app.kubernetes.io/name: percona-server-mongodb
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
     app.kubernetes.io/component: crd
     app.kubernetes.io/part-of: percona-server-mongodb-operator

config/crd/patches/versionlabel_in_psmdbbackup.yaml

@@ -4,6 +4,6 @@ metadata:
   name: perconaservermongodbbackups.psmdb.percona.com
   labels:
     app.kubernetes.io/name: percona-server-mongodb
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
     app.kubernetes.io/component: crd
     app.kubernetes.io/part-of: percona-server-mongodb-operator

config/crd/patches/versionlabel_in_psmdbrestore.yaml

@@ -4,6 +4,6 @@ metadata:
   name: perconaservermongodbrestores.psmdb.percona.com
   labels:
     app.kubernetes.io/name: percona-server-mongodb
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
     app.kubernetes.io/component: crd
     app.kubernetes.io/part-of: percona-server-mongodb-operator

deploy/bundle.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbbackups.psmdb.percona.com
 spec:
   group: psmdb.percona.com
@@ -238,7 +238,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbrestores.psmdb.percona.com
 spec:
   group: psmdb.percona.com
@@ -479,7 +479,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbs.psmdb.percona.com
 spec:
   group: psmdb.percona.com

deploy/cr-minimal.yaml

@@ -3,7 +3,7 @@ kind: PerconaServerMongoDB
 metadata:
   name: minimal-cluster
 spec:
-  crVersion: 1.21.0
+  crVersion: 1.22.0
   image: perconalab/percona-server-mongodb-operator:main-mongod8.0
   unsafeFlags:
     replsetSize: true

deploy/cr.yaml

@@ -14,7 +14,7 @@ spec:
 #  unmanaged: false
 #  enableVolumeExpansion: false
 #  enableExternalVolumeAutoscaling: false
-  crVersion: 1.21.0
+  crVersion: 1.22.0
   image: perconalab/percona-server-mongodb-operator:main-mongod8.0
   imagePullPolicy: Always
 #  tls:
@@ -60,7 +60,7 @@ spec:
 #    sse: my-cluster-name-sse
   pmm:
     enabled: false
-    image: perconalab/pmm-client:dev-latest
+    image: perconalab/pmm-client:3-dev-latest
     serverHost: monitoring-service
 #    containerSecurityContext: {}
 #    customClusterName: mongo-cluster

deploy/crd.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbbackups.psmdb.percona.com
 spec:
   group: psmdb.percona.com
@@ -238,7 +238,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbrestores.psmdb.percona.com
 spec:
   group: psmdb.percona.com
@@ -479,7 +479,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbs.psmdb.percona.com
 spec:
   group: psmdb.percona.com

deploy/cw-bundle.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbbackups.psmdb.percona.com
 spec:
   group: psmdb.percona.com
@@ -238,7 +238,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbrestores.psmdb.percona.com
 spec:
   group: psmdb.percona.com
@@ -479,7 +479,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.0
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbs.psmdb.percona.com
 spec:
   group: psmdb.percona.com

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

@@ -112,11 +112,11 @@ spec:
             timeoutSeconds: 2
           resources:
             limits:
-              cpu: 300m
-              memory: 500M
+              cpu: 600m
+              memory: 1Gi
             requests:
               cpu: 300m
-              memory: 500M
+              memory: 1Gi
           securityContext:
             runAsNonRoot: true
           terminationMessagePath: /dev/termination-log
@@ -267,11 +267,11 @@ spec:
           name: mongo-init
           resources:
             limits:
-              cpu: 300m
-              memory: 500M
+              cpu: 600m
+              memory: 1Gi
             requests:
               cpu: 300m
-              memory: 500M
+              memory: 1Gi
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
           volumeMounts:

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

@@ -112,11 +112,11 @@ spec:
             timeoutSeconds: 2
           resources:
             limits:
-              cpu: 300m
-              memory: 500M
+              cpu: 600m
+              memory: 1Gi
             requests:
               cpu: 300m
-              memory: 500M
+              memory: 1Gi
           securityContext:
             runAsNonRoot: true
           terminationMessagePath: /dev/termination-log
@@ -238,13 +238,13 @@ spec:
               valueFrom:
                 secretKeyRef:
                   key: MONGODB_CLUSTER_ADMIN_USER_ESCAPED
-                  name: internal-another-name-users
+                  name: internal-my-cluster-name-users
                   optional: false
             - name: MONGODB_PASSWORD
               valueFrom:
                 secretKeyRef:
                   key: MONGODB_CLUSTER_ADMIN_PASSWORD_ESCAPED
-                  name: internal-another-name-users
+                  name: internal-my-cluster-name-users
                   optional: false
           imagePullPolicy: IfNotPresent
           name: logrotate
@@ -267,11 +267,11 @@ spec:
           name: mongo-init
           resources:
             limits:
-              cpu: 300m
-              memory: 500M
+              cpu: 600m
+              memory: 1Gi
             requests:
               cpu: 300m
-              memory: 500M
+              memory: 1Gi
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
           volumeMounts:

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

@@ -146,7 +146,7 @@ wait_for_cluster_state "$cluster" "initializing|error"
 
 backup_name_minio="backup-minio-$type"
 run_backup "minio" "$backup_name_minio" "$type"
-wait_backup $backup_name_minio running
+#wait_backup $backup_name_minio running #disabling this check temporarily as backup can be very fast in some platforms
 verify_sts_not_ready
 wait_for_cluster_state "$cluster" "initializing|error"
 

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

@@ -84,13 +84,17 @@ spec:
               value: "true"
             - name: PBM_AGENT_SIDECAR_SLEEP
               value: "5"
+            - name: PBM_AGENT_TLS_ENABLED
+              value: "true"
+            - name: PBM_MONGODB_PORT
+              value: "27017"
             - name: POD_NAME
               valueFrom:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: metadata.name
             - name: PBM_MONGODB_URI
-              value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@$(POD_NAME)
+              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
           envFrom:
             - secretRef:
                 name: internal-some-name-users

e2e-tests/functions

@@ -15,9 +15,9 @@ SKIP_BACKUPS_TO_AWS_GCP_AZURE=${SKIP_BACKUPS_TO_AWS_GCP_AZURE:-1}
 PMM_SERVER_VER=${PMM_SERVER_VER:-"9.9.9"}
 IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"percona/pmm-client:2.44.1-1"}
 IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
-IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3.1.0"}
-IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3.1.0"}
-CERT_MANAGER_VER="1.17.2"
+IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3.4.1"}
+IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3.4.1"}
+CERT_MANAGER_VER="1.18.2"
 MINIO_VER="5.4.0"
 CHAOS_MESH_VER="2.7.1"
 UPDATE_COMPARE_FILES=${UPDATE_COMPARE_FILES:-0}

e2e-tests/ignore-labels-annotations/run

@@ -180,3 +180,5 @@ check_service "cfg"
 check_service "mongos"
 
 destroy "$namespace"
+
+desc 'test passed'

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

@@ -449,6 +449,7 @@
           "cluster": true
         },
         "actions": [
+          "listClusterCatalog",
           "allCollectionStats",
           "appendOplogNote",
           "bypassWriteBlockingMode",

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

@@ -260,6 +260,7 @@
         },
         "actions": [
           "addShard",
+          "listClusterCatalog",
           "allCollectionStats",
           "appendOplogNote",
           "applicationMessage",

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

@@ -198,6 +198,7 @@
           "cluster": true
         },
         "actions": [
+          "listClusterCatalog",
           "allCollectionStats",
           "connPoolStats",
           "getDefaultRWConcern",

e2e-tests/monitoring-2-0/run

@@ -43,12 +43,12 @@ deploy_cert_manager
 desc 'install PMM Server'
 
 deploy_pmm_server
-sleep 20
+sleep 40
 until kubectl_bin exec monitoring-0 -- bash -c "ls -l /proc/*/exe 2>/dev/null| grep postgres >/dev/null"; do
 	echo "Retry $retry"
 	sleep 5
 	let retry+=1
-	if [ $retry -ge 20 ]; then
+	if [ $retry -ge 30 ]; then
 		echo "Max retry count $retry reached. Pmm-server can't start"
 		exit 1
 	fi