Merge branch 'main' into K8SPS-425

egegunes · web-flow · commit 6b9b2811c010 · 2025-06-12T13:13:39.000+03:00
diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
@@ -89,7 +89,7 @@ jobs:
       - name: check on release branch
         if: ${{ contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-') }}
         run: |
-          make generate manifests VERSION="$(grep "Version" pkg/version/version.go|grep -oE "[0-9]+\.[0-9]+\.[0-9]+")" IMAGE_TAG_BASE="percona/percona-server-mysql-operator"
+          make generate manifests VERSION="$(grep -Eo "[0-9]+\.[0-9]+\.[0-9]+" pkg/version/version.txt)" IMAGE_TAG_BASE="percona/percona-server-mysql-operator"
           git diff --exit-code
       - name: check on non release branches
         if: ${{ ! (contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-')) }}
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -251,9 +251,9 @@ void prepareNode() {
         sudo curl -s -L -o /usr/local/bin/kubectl https://dl.k8s.io/release/\$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl && sudo chmod +x /usr/local/bin/kubectl
         kubectl version --client --output=yaml
 
-        curl -fsSL https://get.helm.sh/helm-v3.12.3-linux-amd64.tar.gz | sudo tar -C /usr/local/bin --strip-components 1 -xzf - linux-amd64/helm
+        curl -fsSL https://get.helm.sh/helm-v3.18.0-linux-amd64.tar.gz | sudo tar -C /usr/local/bin --strip-components 1 -xzf - linux-amd64/helm
 
-        sudo curl -fsSL https://github.com/mikefarah/yq/releases/download/v4.44.1/yq_linux_amd64 -o /usr/local/bin/yq && sudo chmod +x /usr/local/bin/yq
+        sudo curl -fsSL https://github.com/mikefarah/yq/releases/download/v4.45.4/yq_linux_amd64 -o /usr/local/bin/yq && sudo chmod +x /usr/local/bin/yq
         sudo curl -fsSL https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 -o /usr/local/bin/jq && sudo chmod +x /usr/local/bin/jq
 
         curl -fsSL https://github.com/kubernetes-sigs/krew/releases/latest/download/krew-linux_amd64.tar.gz | tar -xzf -
@@ -262,8 +262,8 @@ void prepareNode() {
 
         kubectl krew install assert
 
-        # v0.17.0 kuttl version
-        kubectl krew install --manifest-url https://raw.githubusercontent.com/kubernetes-sigs/krew-index/336ef83542fd2f783bfa2c075b24599e834dcc77/plugins/kuttl.yaml
+        # v0.22.0 kuttl version
+        kubectl krew install --manifest-url https://raw.githubusercontent.com/kubernetes-sigs/krew-index/02d5befb2bc9554fdcd8386b8bfbed2732d6802e/plugins/kuttl.yaml
         echo \$(kubectl kuttl --version) is installed
 
         curl -fsSL https://github.com/kyverno/chainsaw/releases/download/v0.1.7/chainsaw_linux_amd64.tar.gz | sudo tar -C /usr/local/bin -xzf - chainsaw
diff --git a/config/crd/patches/versionlabel_in_perconaserverformysql.yaml b/config/crd/patches/versionlabel_in_perconaserverformysql.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   name: perconaservermysqls.ps.percona.com
   labels:
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
     app.kubernetes.io/component: crd
diff --git a/config/crd/patches/versionlabel_in_perconaserverformysqlbackups.yaml b/config/crd/patches/versionlabel_in_perconaserverformysqlbackups.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   name: perconaservermysqlbackups.ps.percona.com
   labels:
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
     app.kubernetes.io/component: crd
diff --git a/config/crd/patches/versionlabel_in_perconaserverformysqlrestores.yaml b/config/crd/patches/versionlabel_in_perconaserverformysqlrestores.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   name: perconaservermysqlrestores.ps.percona.com
   labels:
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
     app.kubernetes.io/component: crd
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -12,7 +12,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: perconalab/percona-server-mysql-operator
+  newName: percona/percona-server-mysql-operator
   newTag: main
 - name: perconalab/percona-server-mysql-operator
   newName: perconalab/percona-server-mysql-operator
diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
   name: perconaservermysqlbackups.ps.percona.com
 spec:
   group: ps.percona.com
@@ -967,7 +967,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
   name: perconaservermysqlrestores.ps.percona.com
 spec:
   group: ps.percona.com
@@ -1926,7 +1926,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
   name: perconaservermysqls.ps.percona.com
 spec:
   group: ps.percona.com
diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -14,7 +14,7 @@ spec:
 #    proxy: false
 #    proxySize: false
 #  pause: false
-  crVersion: 0.10.0
+  crVersion: 0.11.0
   secretsName: cluster1-secrets
   sslSecretName: cluster1-ssl
   updateStrategy: SmartUpdate
diff --git a/deploy/crd.yaml b/deploy/crd.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
   name: perconaservermysqlbackups.ps.percona.com
 spec:
   group: ps.percona.com
@@ -967,7 +967,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
   name: perconaservermysqlrestores.ps.percona.com
 spec:
   group: ps.percona.com
@@ -1926,7 +1926,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
   name: perconaservermysqls.ps.percona.com
 spec:
   group: ps.percona.com
diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
   name: perconaservermysqlbackups.ps.percona.com
 spec:
   group: ps.percona.com
@@ -967,7 +967,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
   name: perconaservermysqlrestores.ps.percona.com
 spec:
   group: ps.percona.com
@@ -1926,7 +1926,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server
     app.kubernetes.io/part-of: percona-server-mysql-operator
-    app.kubernetes.io/version: v0.10.0
+    app.kubernetes.io/version: v0.11.0
   name: perconaservermysqls.ps.percona.com
 spec:
   group: ps.percona.com
diff --git a/e2e-tests/functions b/e2e-tests/functions
@@ -781,14 +781,19 @@ deploy_chaos_mesh() {
 
 	helm repo add chaos-mesh https://charts.chaos-mesh.org
 	if [ -n "${MINIKUBE}" ]; then
-		helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${NAMESPACE} --set chaosDaemon.runtime=docker --set dashboard.create=false --version ${CHAOS_MESH_VER}
+		helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${NAMESPACE} --set chaosDaemon.runtime=docker --set dashboard.create=false --version ${CHAOS_MESH_VER} --wait
 	else
 		helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${NAMESPACE} --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/run/containerd/containerd.sock --set dashboard.create=false --version ${CHAOS_MESH_VER}
 	fi
 	if [[ -n $OPENSHIFT ]]; then
 		oc adm policy add-scc-to-user privileged -z chaos-daemon --namespace=${NAMESPACE}
 	fi
-	sleep 10
+
+	echo "Waiting for chaos-mesh DaemonSet to be ready..."
+    until [ "$(kubectl get daemonset chaos-daemon -n ${NAMESPACE} -o jsonpath='{.status.numberReady}')" = "$(kubectl get daemonset chaos-daemon -n ${NAMESPACE} -o jsonpath='{.status.desiredNumberScheduled}')" ]; do
+        echo "Waiting for DaemonSet chaos-daemon..."
+        sleep 5
+    done
 }
 
 destroy_chaos_mesh() {
diff --git a/e2e-tests/release_versions b/e2e-tests/release_versions
@@ -1,19 +1,21 @@
 # Images versions
-IMAGE_OPERATOR=percona/percona-server-mysql-operator:0.9.0
+IMAGE_OPERATOR=percona/percona-server-mysql-operator:0.10.0
 
-IMAGE_MYSQL80=percona/percona-server:8.0.40-31
-IMAGE_BACKUP80=percona/percona-xtrabackup:8.0.35-31
-IMAGE_ROUTER80=percona/percona-mysql-router:8.0.40
+IMAGE_MYSQL80=percona/percona-server:8.0.42-33
+IMAGE_BACKUP80=percona/percona-xtrabackup:8.0.35-33
+IMAGE_ROUTER80=percona/percona-mysql-router:8.0.42
 
-IMAGE_HAPROXY=percona/haproxy:2.8.11
-IMAGE_ORCHESTRATOR=percona/percona-orchestrator:3.2.6-15
+IMAGE_HAPROXY=percona/haproxy:2.8.14
+IMAGE_ORCHESTRATOR=percona/percona-orchestrator:3.2.6-17
 IMAGE_TOOLKIT=percona/percona-toolkit:3.7.0
-IMAGE_PMM_CLIENT=percona/pmm-client:2.44.0
-IMAGE_PMM_SERVER=percona/pmm-server:2.44.0
+IMAGE_PMM_CLIENT=percona/pmm-client:3.2.0
+IMAGE_PMM_SERVER=percona/pmm-server:3.2.0
 
 # Supported k8s versions
-GKE_MIN=1.29
-GKE_MAX=1.31
-EKS_MIN=1.29
+GKE_MIN=1.30
+GKE_MAX=1.32
+EKS_MIN=1.30
 EKS_MAX=1.32
-MINIKUBE_MAX=1.32.0
+OPENSHIFT_MIN=4.15.51
+OPENSHIFT_MAX=4.18.15
+MINIKUBE_MAX=1.33.0
diff --git a/e2e-tests/tests/gr-self-healing/01-assert.yaml b/e2e-tests/tests/gr-self-healing/01-assert.yaml
@@ -13,16 +13,3 @@ status:
   readyReplicas: 3
   replicas: 3
   updatedReplicas: 3
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: chaos-daemon
-status:
-  currentNumberScheduled: 3
-  desiredNumberScheduled: 3
-  numberAvailable: 3
-  numberMisscheduled: 0
-  numberReady: 3
-  observedGeneration: 1
-  updatedNumberScheduled: 3
diff --git a/e2e-tests/tests/gr-self-healing/05-kill-primary.yaml b/e2e-tests/tests/gr-self-healing/05-kill-primary.yaml
@@ -10,7 +10,7 @@ commands:
 
       init_pod="$(get_primary_from_group_replication)"
       kill_pods "${NAMESPACE}" "pod" "$init_pod" "" "primary"
-      sleep 10 # wait a bit for pod to be killed
+      sleep 20 # wait a bit for pod to be killed
 
       if [ "$init_pod" == "$(get_primary_from_group_replication)" ]; then
           echo "primary pod was not killed! something went wrong."
diff --git a/e2e-tests/tests/gr-self-healing/07-assert.yaml b/e2e-tests/tests/gr-self-healing/07-assert.yaml
@@ -1,6 +1,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 30
+timeout: 120
 ---
 kind: ConfigMap
 apiVersion: v1
diff --git a/e2e-tests/tests/gr-self-healing/12-write-data.yaml b/e2e-tests/tests/gr-self-healing/12-write-data.yaml
@@ -10,4 +10,4 @@ commands:
       run_mysql \
           "INSERT myDB.myTable (id) VALUES (100503)" \
           "-h $(get_mysql_router_service $(get_cluster_name)) -P 6446 -uroot -proot_password"
-      sleep 5
+      sleep 10
diff --git a/e2e-tests/tests/gr-self-healing/13-assert.yaml b/e2e-tests/tests/gr-self-healing/13-assert.yaml
@@ -1,6 +1,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 30
+timeout: 240
 ---
 apiVersion: ps.percona.com/v1alpha1
 kind: PerconaServerMySQL
diff --git a/e2e-tests/tests/gr-self-healing/13-read-from-replicas.yaml b/e2e-tests/tests/gr-self-healing/13-read-from-replicas.yaml
@@ -1,6 +1,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
-timeout: 30
+timeout: 120
 commands:
   - script: |-
       set -o errexit
@@ -13,3 +13,4 @@ commands:
           data=$(run_mysql "SELECT * FROM myDB.myTable" "-h ${host} -uroot -proot_password")
           kubectl create configmap -n "${NAMESPACE}" 13-read-from-replicas-${i} --from-literal=data="${data}"
       done
+      sleep 20
diff --git a/e2e-tests/tests/gr-self-healing/14-cluster-crash.yaml b/e2e-tests/tests/gr-self-healing/14-cluster-crash.yaml
@@ -9,4 +9,4 @@ commands:
 
       kill_pods "${NAMESPACE}" "label" "app.kubernetes.io/instance" "gr-self-healing" "cluster-crash"
       sleep 30 # wait for crash
-    timeout: 40
+    timeout: 100
diff --git a/e2e-tests/tests/gr-self-healing/17-quorum-loss.yaml b/e2e-tests/tests/gr-self-healing/17-quorum-loss.yaml
@@ -1,6 +1,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
-timeout: 30
+timeout: 480
 commands:
   - script: |-
       set -o errexit
diff --git a/e2e-tests/tests/operator-self-healing/02-assert.yaml b/e2e-tests/tests/operator-self-healing/02-assert.yaml
@@ -59,15 +59,3 @@ status:
     state: ready
   state: ready
 ---
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: chaos-daemon
-status:
-  currentNumberScheduled: 3
-  desiredNumberScheduled: 3
-  numberAvailable: 3
-  numberMisscheduled: 0
-  numberReady: 3
-  observedGeneration: 1
-  updatedNumberScheduled: 3
diff --git a/pkg/version/version.txt b/pkg/version/version.txt
@@ -1 +1 @@
-0.10.0
+0.11.0
