Merge branch 'main' into dependabot/go_modules/go.mongodb.org/mongo-driver-1.17.7

Author: hors

Jenkinsfile

@@ -16,7 +16,7 @@ void createCluster(String CLUSTER_SUFFIX) {
                     --preemptible \
                     --zone=${region} \
                     --machine-type='n1-standard-4' \
-                    --cluster-version='1.31' \
+                    --cluster-version='1.32' \
                     --num-nodes=3 \
                     --labels='delete-cluster-after-hours=6' \
                     --disk-size=30 \

e2e-tests/demand-backup-physical-minio-native-tls/compare/statefulset_some-name-rs0_restore-oc.yml

@@ -3,7 +3,7 @@ kind: StatefulSet
 metadata:
   annotations:
     percona.com/restore-in-progress: "true"
-  generation: 9
+  generation: 3
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name
@@ -267,7 +267,7 @@ spec:
                   items:
                     - key: ca.crt
                       path: ca-1.crt
-                  name: minio2-ca-bundle
+                  name: secondary-minio-ca-bundle
         - emptyDir: {}
           name: ca-bundle
         - name: pbm-config

e2e-tests/demand-backup-physical-minio-native-tls/compare/statefulset_some-name-rs0_restore.yml

@@ -3,7 +3,7 @@ kind: StatefulSet
 metadata:
   annotations:
     percona.com/restore-in-progress: "true"
-  generation: 9
+  generation: 3
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name
@@ -269,7 +269,7 @@ spec:
                   items:
                     - key: ca.crt
                       path: ca-1.crt
-                  name: minio2-ca-bundle
+                  name: secondary-minio-ca-bundle
         - emptyDir: {}
           name: ca-bundle
         - name: pbm-config

…-minio-native-tls/conf/minio2-secret.yml …tive-tls/conf/secondary-minio-secret.ymle2e-tests/demand-backup-physical-minio-native-tls/conf/minio2-secret.yml renamed to e2e-tests/demand-backup-physical-minio-native-tls/conf/secondary-minio-secret.yml e2e-tests/demand-backup-physical-minio-native-tls/conf/minio2-secret.yml renamed to e2e-tests/demand-backup-physical-minio-native-tls/conf/secondary-minio-secret.yml

@@ -1,8 +1,8 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: minio2-secret
+  name: secondary-minio-secret
 type: Opaque
 data:
   AWS_ACCESS_KEY_ID: c29tZS1hY2Nlc3Mta2V5
-  AWS_SECRET_ACCESS_KEY: c29tZS1zZWNyZXQta2V5
+  AWS_SECRET_ACCESS_KEY: c29tZS1zZWNyZXQta2V5

e2e-tests/demand-backup-physical-minio-native-tls/run

@@ -71,7 +71,7 @@ desc 'Deploy first MinIO with TLS'
 deploy_minio minio-tls
 apply_s3_storage_secrets
 
-kubectl_bin apply -f "${test_dir}/conf/minio2-secret.yml"
+kubectl_bin apply -f "${test_dir}/conf/secondary-minio-secret.yml"
 
 ###############################################################################
 # Phase 1: Single CA bundle test
@@ -107,67 +107,67 @@ cert_count=$(kubectl_bin exec ${cluster}-rs0-0 -n ${namespace} -c backup-agent -
 # Phase 2: Second MinIO
 ###############################################################################
 
-desc 'Generate certificate for second MinIO'
+desc 'Generate certificate for secondary MinIO'
 
 kubectl_bin apply -f - <<EOF
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: minio2-cert
+  name: secondary-minio-cert
   namespace: ${namespace}
 spec:
-  secretName: minio2-tls-temp
+  secretName: secondary-minio-tls-temp
   issuerRef:
     name: selfsigned-issuer
     kind: Issuer
-  commonName: minio2-service
+  commonName: secondary-minio-service
   dnsNames:
-  - minio2-service
-  - minio2-service.${namespace}
-  - minio2-service.${namespace}.svc
-  - minio2-service.${namespace}.svc.cluster.local
+  - secondary-minio-service
+  - secondary-minio-service.${namespace}
+  - secondary-minio-service.${namespace}.svc
+  - secondary-minio-service.${namespace}.svc.cluster.local
   usages:
   - digital signature
   - key encipherment
   - server auth
 EOF
 
-kubectl_bin wait --for=condition=Ready certificate/minio2-cert \
+kubectl_bin wait --for=condition=Ready certificate/secondary-minio-cert \
   -n ${namespace} --timeout=120s
 
-kubectl_bin get secret minio2-tls-temp -n ${namespace} \
-  -o jsonpath='{.data.tls\.crt}' | base64 -d > /tmp/minio2-cert.pem
+kubectl_bin get secret secondary-minio-tls-temp -n ${namespace} \
+  -o jsonpath='{.data.tls\.crt}' | base64 -d > /tmp/secondary-minio-cert.pem
 
-kubectl_bin get secret minio2-tls-temp -n ${namespace} \
-  -o jsonpath='{.data.tls\.key}' | base64 -d > /tmp/minio2-key.pem
+kubectl_bin get secret secondary-minio-tls-temp -n ${namespace} \
+  -o jsonpath='{.data.tls\.key}' | base64 -d > /tmp/secondary-minio-key.pem
 
-kubectl_bin create secret generic minio2-tls -n ${namespace} \
-  --from-file=public.crt=/tmp/minio2-cert.pem \
-  --from-file=private.key=/tmp/minio2-key.pem
+kubectl_bin create secret generic secondary-minio-tls -n ${namespace} \
+  --from-file=public.crt=/tmp/secondary-minio-cert.pem \
+  --from-file=private.key=/tmp/secondary-minio-key.pem
 
-kubectl_bin create secret generic minio2-ca-bundle -n ${namespace} \
-  --from-file=ca.crt=/tmp/minio2-cert.pem
+kubectl_bin create secret generic secondary-minio-ca-bundle -n ${namespace} \
+  --from-file=ca.crt=/tmp/secondary-minio-cert.pem
 
-deploy_minio "minio2-tls" "minio2-service"
+deploy_minio "secondary-minio-tls" "secondary-minio-service"
 
-desc "Add second storage"
+desc "Add second storage (secondary)"
 
 kubectl_bin patch psmdb ${cluster} -n ${namespace} --type=merge -p '
 {
   "spec": {
     "backup": {
       "storages": {
-        "minio2": {
+        "secondary": {
           "type": "minio",
           "minio": {
-            "credentialsSecret": "minio2-secret",
+            "credentialsSecret": "secondary-minio-secret",
             "region": "us-east-1",
             "bucket": "operator-testing",
-            "endpointUrl": "https://minio2-service:9000",
+            "endpointUrl": "https://secondary-minio-service:9000",
             "secure": true,
             "insecureSkipTLSVerify": false,
             "caBundle": {
-              "name": "minio2-ca-bundle",
+              "name": "secondary-minio-ca-bundle",
               "key": "ca.crt"
             }
           }
@@ -212,7 +212,7 @@ run_restore ${backup_name_single}
 run_recovery_check ${backup_name_single} "" "" "true"
 
 rm -f /tmp/minio-cert.pem /tmp/minio-key.pem
-rm -f /tmp/minio2-cert.pem /tmp/minio2-key.pem
+rm -f /tmp/secondary-minio-cert.pem /tmp/secondary-minio-key.pem
 
 destroy "${namespace}"
 

pkg/psmdb/statefulset.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"path"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -719,34 +720,43 @@ func PodTopologySpreadConstraints(cr *api.PerconaServerMongoDB, tscs []corev1.To
 }
 
 func collectStorageCABundles(cr *api.PerconaServerMongoDB) []api.SecretKeySelector {
-
 	if cr.Spec.Backup.Storages == nil {
 		return nil
 	}
 
 	seen := map[string]struct{}{}
 	var out []api.SecretKeySelector
 
-	for _, storage := range cr.Spec.Backup.Storages {
+	// Sort storage names to ensure deterministic ordering
+	// This prevents StatefulSet generation increment due to random map iteration
+	storageNames := make([]string, 0, len(cr.Spec.Backup.Storages))
+	for name := range cr.Spec.Backup.Storages {
+		storageNames = append(storageNames, name)
+	}
+	sort.Strings(storageNames)
+
+	for _, name := range storageNames {
+		storage := cr.Spec.Backup.Storages[name]
+
 		if storage.Type != api.BackupStorageMinio {
 			continue
 		}
-		if storage.Minio.CABundle != nil &&
-			storage.Minio.CABundle.Name != "" {
 
-			key := storage.Minio.CABundle.Key
-			if key == "" {
-				key = "ca.crt"
-			}
+		if storage.Minio.CABundle == nil || storage.Minio.CABundle.Name == "" {
+			continue
+		}
+		key := storage.Minio.CABundle.Key
+		if key == "" {
+			key = "ca.crt"
+		}
 
-			k := storage.Minio.CABundle.Name + "/" + key
-			if _, ok := seen[k]; !ok {
-				out = append(out, api.SecretKeySelector{
-					Name: storage.Minio.CABundle.Name,
-					Key:  key,
-				})
-				seen[k] = struct{}{}
-			}
+		k := storage.Minio.CABundle.Name + "/" + key
+		if _, ok := seen[k]; !ok {
+			out = append(out, api.SecretKeySelector{
+				Name: storage.Minio.CABundle.Name,
+				Key:  key,
+			})
+			seen[k] = struct{}{}
 		}
 	}