Merge branch 'main' into release-1.16.1

Author: tplavcic

.github/workflows/reviewdog.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/[email protected]
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v5
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
           only-new-issues: true
@@ -79,6 +79,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: |
+      - name: check on release branch
+        if: ${{ contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-') }}
+        run: |
+          make generate manifests VERSION="$(grep "Version" version/version.go|grep -oE "[0-9]+\.[0-9]+\.[0-9]+")" IMAGE_TAG_BASE="percona/percona-server-mongodb-operator"
+          git diff --exit-code
+      - name: check on non release branches
+        if: ${{ ! (contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-')) }}
+        run: |
           make generate manifests VERSION=main
           git diff --exit-code

.github/workflows/scan.yml

@@ -30,7 +30,7 @@ jobs:
           export DOCKER_DEFAULT_PLATFORM='linux/arm64'
           ./e2e-tests/build
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.19.0
+        uses: aquasecurity/trivy-action@0.21.0
         with:
           image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-arm64'
           format: 'table'
@@ -48,7 +48,7 @@ jobs:
           ./e2e-tests/build
 
       - name: Run Trivy vulnerability scanner image (linux/amd64)
-        uses: aquasecurity/trivy-action@0.19.0
+        uses: aquasecurity/trivy-action@0.21.0
         with:
           image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-amd64'
           format: 'table'

Jenkinsfile

@@ -277,11 +277,8 @@ pipeline {
 
                     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
 
-                    sudo sh -c "curl -s -L https://github.com/mikefarah/yq/releases/download/v4.35.1/yq_linux_amd64 > /usr/local/bin/yq"
-                    sudo chmod +x /usr/local/bin/yq
-
-                    sudo sh -c "curl -s -L https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 > /usr/local/bin/jq"
-                    sudo chmod +x /usr/local/bin/jq
+                    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/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 -o /usr/local/bin/jq && sudo chmod +x /usr/local/bin/jq
 
                     sudo tee /etc/yum.repos.d/google-cloud-sdk.repo << EOF
 [google-cloud-cli]

deploy/cr.yaml

@@ -54,7 +54,7 @@ spec:
 #    sse: my-cluster-name-sse
   pmm:
     enabled: false
-    image: percona/pmm-client:2.41.2
+    image: perconalab/pmm-client:dev-latest
     serverHost: monitoring-service
 #    mongodParams: --environment=ENVIRONMENT
 #    mongosParams: --environment=ENVIRONMENT
@@ -532,7 +532,7 @@ spec:
 
   backup:
     enabled: true
-    image: percona/percona-backup-mongodb:2.4.1
+    image: perconalab/percona-server-mongodb-operator:main-backup
 #    annotations:
 #      iam.amazonaws.com/role: role-arn
 #    resources:

e2e-tests/ignore-labels-annotations/compare/service_some-name-cfg-0-crmeta.yml

@@ -24,6 +24,7 @@ spec:
       port: 27017
       protocol: TCP
       targetPort: 27017
+  publishNotReadyAddresses: true
   selector:
     statefulset.kubernetes.io/pod-name: some-name-cfg-0
   sessionAffinity: None

e2e-tests/ignore-labels-annotations/compare/service_some-name-cfg-0-manual.yml

@@ -24,6 +24,7 @@ spec:
       port: 27017
       protocol: TCP
       targetPort: 27017
+  publishNotReadyAddresses: true
   selector:
     statefulset.kubernetes.io/pod-name: some-name-cfg-0
   sessionAffinity: None

e2e-tests/ignore-labels-annotations/compare/service_some-name-cfg-0-no-ignored-meta.yml

@@ -22,6 +22,7 @@ spec:
       port: 27017
       protocol: TCP
       targetPort: 27017
+  publishNotReadyAddresses: true
   selector:
     statefulset.kubernetes.io/pod-name: some-name-cfg-0
   sessionAffinity: None

e2e-tests/ignore-labels-annotations/compare/service_some-name-cfg-0-one-service-label-annotation.yml

@@ -24,6 +24,7 @@ spec:
       port: 27017
       protocol: TCP
       targetPort: 27017
+  publishNotReadyAddresses: true
   selector:
     statefulset.kubernetes.io/pod-name: some-name-cfg-0
   sessionAffinity: None

e2e-tests/ignore-labels-annotations/compare/service_some-name-cfg-0-two-service-labels-annotations.yml

@@ -26,6 +26,7 @@ spec:
       port: 27017
       protocol: TCP
       targetPort: 27017
+  publishNotReadyAddresses: true
   selector:
     statefulset.kubernetes.io/pod-name: some-name-cfg-0
   sessionAffinity: None

e2e-tests/ignore-labels-annotations/compare/service_some-name-rs0-0-crmeta.yml

@@ -24,6 +24,7 @@ spec:
       port: 27017
       protocol: TCP
       targetPort: 27017
+  publishNotReadyAddresses: true
   selector:
     statefulset.kubernetes.io/pod-name: some-name-rs0-0
   sessionAffinity: None