Merge branch 'main' into K8SPS-413

hors · web-flow · commit f59a19f21f21 · 2025-08-26T11:14:55.000+03:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -628,6 +628,66 @@ pipeline {
                         clusterRunner('cluster7')
                     }
                 }
+                stage('cluster8') {
+                    when {
+                        expression {
+                            isPRJob && needToRunTests
+                        }
+                    }
+                    agent {
+                        label 'docker-x64-min'
+                    }
+                    steps {
+                        prepareNode()
+                        unstash "sourceFILES"
+                        clusterRunner('cluster8')
+                    }
+                }
+                stage('cluster9') {
+                    when {
+                        expression {
+                            isPRJob && needToRunTests
+                        }
+                    }
+                    agent {
+                        label 'docker-x64-min'
+                    }
+                    steps {
+                        prepareNode()
+                        unstash "sourceFILES"
+                        clusterRunner('cluster9')
+                    }
+                }
+                stage('cluster10') {
+                    when {
+                        expression {
+                            isPRJob && needToRunTests
+                        }
+                    }
+                    agent {
+                        label 'docker-x64-min'
+                    }
+                    steps {
+                        prepareNode()
+                        unstash "sourceFILES"
+                        clusterRunner('cluster10')
+                    }
+                }
+                stage('cluster11') {
+                    when {
+                        expression {
+                            isPRJob && needToRunTests
+                        }
+                    }
+                    agent {
+                        label 'docker-x64-min'
+                    }
+                    steps {
+                        prepareNode()
+                        unstash "sourceFILES"
+                        clusterRunner('cluster11')
+                    }
+                }
             }
         }
     }
diff --git a/build/heartbeat-entrypoint.sh b/build/heartbeat-entrypoint.sh
@@ -30,6 +30,9 @@ for i in {1..5}; do
 	fi
 done
 
+# If password contains commas they must be escaped with a backslash: “exam,ple” according https://docs.percona.com/percona-toolkit/pt-heartbeat.html
+ESCAPED_HEARTBEAT_PASSWORD="${HEARTBEAT_PASSWORD//,/\\,}"
+
 HEARTBEAT_USER='heartbeat'
 echo "[INFO] pt-heartbeat --update --replace --fail-successive-errors 20 --check-read-only --create-table --database sys_operator \
 	--table heartbeat --user ${HEARTBEAT_USER} --password XXXX --port ${MYSQL_ADMIN_PORT}"
@@ -43,5 +46,5 @@ pt-heartbeat \
 	--database sys_operator \
 	--table heartbeat \
 	--user "${HEARTBEAT_USER}" \
-	--password "${HEARTBEAT_PASSWORD}" \
+	--password "${ESCAPED_HEARTBEAT_PASSWORD}" \
 	--port "${MYSQL_ADMIN_PORT}"
diff --git a/build/ps-entrypoint.sh b/build/ps-entrypoint.sh
@@ -42,7 +42,6 @@ file_env() {
 	fi
 	export "$var"="$val"
 	unset "$fileVar"
-	set -o xtrace
 }
 
 # usage: process_init_file FILENAME MYSQLCOMMAND...
@@ -294,7 +293,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			MYSQL_ROOT_PASSWORD="$(pwmake 128)"
 			echo "GENERATED ROOT PASSWORD: $MYSQL_ROOT_PASSWORD"
 		fi
-		set -x
 
 		rootCreate=
 		# default root to listen for connections from anywhere
@@ -366,7 +364,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			FLUSH PRIVILEGES ;
 		EOSQL
 
-		{ set +x; } 2>/dev/null
 		if [ -n "$MYSQL_ROOT_PASSWORD" ]; then
 			mysql+=(-p"${MYSQL_ROOT_PASSWORD}")
 		fi
diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -157,6 +157,15 @@ spec:
 #        path: /data
 #        type: Directory
       persistentVolumeClaim:
+#        dataSource:
+#          apiGroup: ""
+#          kind: PersistentVolumeClaim
+#          name: source-pvc
+#        dataSourceRef:
+#          apiGroup: ""
+#          kind: PersistentVolumeClaim
+#          name: source-pvc
+#          namespace: default
 #        storageClassName: standard
 #        accessModes: [ "ReadWriteOnce" ]
         resources:
diff --git a/go.mod b/go.mod
@@ -26,10 +26,10 @@ require (
 	golang.org/x/sync v0.16.0
 	golang.org/x/text v0.28.0
 	google.golang.org/grpc v1.74.2
-	k8s.io/api v0.33.3
-	k8s.io/apiextensions-apiserver v0.33.3
-	k8s.io/apimachinery v0.33.3
-	k8s.io/client-go v0.33.3
+	k8s.io/api v0.33.4
+	k8s.io/apiextensions-apiserver v0.33.4
+	k8s.io/apimachinery v0.33.4
+	k8s.io/client-go v0.33.4
 	k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
 	sigs.k8s.io/controller-runtime v0.21.0
 )
diff --git a/go.sum b/go.sum
@@ -329,14 +329,14 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
-k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
-k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
-k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
-k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
-k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
-k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
+k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk=
+k8s.io/api v0.33.4/go.mod h1:VHQZ4cuxQ9sCUMESJV5+Fe8bGnqAARZ08tSTdHWfeAc=
+k8s.io/apiextensions-apiserver v0.33.4 h1:rtq5SeXiDbXmSwxsF0MLe2Mtv3SwprA6wp+5qh/CrOU=
+k8s.io/apiextensions-apiserver v0.33.4/go.mod h1:mWXcZQkQV1GQyxeIjYApuqsn/081hhXPZwZ2URuJeSs=
+k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s=
+k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/client-go v0.33.4 h1:TNH+CSu8EmXfitntjUPwaKVPN0AYMbc9F1bBS8/ABpw=
+k8s.io/client-go v0.33.4/go.mod h1:LsA0+hBG2DPwovjd931L/AoaezMPX9CmBgyVyBZmbCY=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
diff --git a/pkg/k8s/pvc.go b/pkg/k8s/pvc.go
@@ -16,6 +16,8 @@ func PVC(name string, spec *apiv1alpha1.VolumeSpec) corev1.PersistentVolumeClaim
 			StorageClassName: spec.PersistentVolumeClaim.StorageClassName,
 			AccessModes:      spec.PersistentVolumeClaim.AccessModes,
 			Resources:        spec.PersistentVolumeClaim.Resources,
+			DataSource:       spec.PersistentVolumeClaim.DataSource,
+			DataSourceRef:    spec.PersistentVolumeClaim.DataSourceRef,
 		},
 	}
 }
diff --git a/pkg/k8s/pvc_test.go b/pkg/k8s/pvc_test.go
@@ -3,11 +3,12 @@ package k8s
 import (
 	"testing"
 
-	apiv1alpha1 "github.com/percona/percona-server-mysql-operator/api/v1alpha1"
-
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/utils/ptr"
+
+	apiv1alpha1 "github.com/percona/percona-server-mysql-operator/api/v1alpha1"
 )
 
 func TestPVC(t *testing.T) {
@@ -16,6 +17,17 @@ func TestPVC(t *testing.T) {
 	requests := corev1.ResourceList{
 		corev1.ResourceStorage: resource.MustParse("2Gi"),
 	}
+	dataSource := &corev1.TypedLocalObjectReference{
+		APIGroup: ptr.To("some-api-group"),
+		Kind:     "some-kind",
+		Name:     "some-name",
+	}
+	dataSourceRef := &corev1.TypedObjectReference{
+		APIGroup:  ptr.To("some-api-group-2"),
+		Kind:      "some-kind-2",
+		Name:      "some-name-2",
+		Namespace: ptr.To("namespace"),
+	}
 
 	spec := &apiv1alpha1.VolumeSpec{
 		PersistentVolumeClaim: &corev1.PersistentVolumeClaimSpec{
@@ -24,6 +36,8 @@ func TestPVC(t *testing.T) {
 			Resources: corev1.VolumeResourceRequirements{
 				Requests: requests,
 			},
+			DataSource:    dataSource,
+			DataSourceRef: dataSourceRef,
 		},
 	}
 
@@ -36,4 +50,6 @@ func TestPVC(t *testing.T) {
 	assert.Equal(t, storageClassName, *pvc.Spec.StorageClassName)
 	assert.Equal(t, accessModes, pvc.Spec.AccessModes)
 	assert.Equal(t, requests, pvc.Spec.Resources.Requests)
+	assert.Equal(t, dataSource, pvc.Spec.DataSource)
+	assert.Equal(t, dataSourceRef, pvc.Spec.DataSourceRef)
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ func PVC(name string, spec *apiv1alpha1.VolumeSpec) corev1.PersistentVolumeClaim`
`16`	`16`	`StorageClassName: spec.PersistentVolumeClaim.StorageClassName,`
`17`	`17`	`AccessModes: spec.PersistentVolumeClaim.AccessModes,`
`18`	`18`	`Resources: spec.PersistentVolumeClaim.Resources,`
	`19`	`+ DataSource: spec.PersistentVolumeClaim.DataSource,`
	`20`	`+ DataSourceRef: spec.PersistentVolumeClaim.DataSourceRef,`
`19`	`21`	`},`
`20`	`22`	`}`
`21`	`23`	`}`