Merge branch 'main' into CLOUD-789-2

percona · Oct 13, 2023 · 97526dd · 97526dd
2 parents ce4f2e4 + 7f6cdbe
commit 97526dd
Show file tree

Hide file tree

Showing 85 changed files with 467 additions and 303 deletions.
diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
@@ -5,7 +5,7 @@ jobs:
     name: runner / suggester / golangci-lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
@@ -17,7 +17,7 @@ jobs:
     name: runner / suggester / gofmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
       - run: gofmt -w -s $(find . -not -path "*/vendor/*" -name "*.go")
       - uses: reviewdog/action-suggester@v1
         with:
@@ -27,7 +27,7 @@ jobs:
     name: runner / suggester / shfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
       - uses: actions/setup-go@v4
         with:
           go-version: '^1.17'
@@ -43,7 +43,7 @@ jobs:
     name: runner / shellcheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
       - uses: reviewdog/action-shellcheck@v1
         with:
           github_token: ${{ secrets.github_token }}
@@ -54,7 +54,7 @@ jobs:
     name: runner / misspell
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
       - uses: reviewdog/action-misspell@v1
         with:
           github_token: ${{ secrets.github_token }}
@@ -66,7 +66,7 @@ jobs:
     name: runner / alex
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
       - uses: reviewdog/action-alex@v1
         with:
           github_token: ${{ secrets.github_token }}

diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -6,15 +6,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.0
       - name: Build an image from Dockerfile
         run: |
           export IMAGE=perconalab/percona-server-mongodb-operator:${{ github.sha }}
           export DOCKER_PUSH=0
           export DOCKER_SQUASH=0
           ./e2e-tests/build
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.11.2
+        uses: aquasecurity/trivy-action@0.12.0
         with:
           image-ref: 'docker.io/perconalab/percona-server-mongodb-operator:${{ github.sha }}'
           format: 'table'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,6 +8,6 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: '^1.19'
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
       - name: go test
         run: go test -v ./...
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -244,6 +244,7 @@ pipeline {
     environment {
         CLOUDSDK_CORE_DISABLE_PROMPTS = 1
         CLEAN_NAMESPACE = 1
+        OPERATOR_NS = 'psmdb-operator'
         GIT_SHORT_COMMIT = sh(script: 'git rev-parse --short HEAD', , returnStdout: true).trim()
         VERSION = "${env.GIT_BRANCH}-${env.GIT_SHORT_COMMIT}"
         CLUSTER_NAME = sh(script: "echo jen-psmdb-${env.CHANGE_ID}-${GIT_SHORT_COMMIT}-${env.BUILD_NUMBER} | tr '[:upper:]' '[:lower:]'", , returnStdout: true).trim()

diff --git a/config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml b/config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml
@@ -131,11 +131,6 @@ spec:
                         type: string
                       sseCustomerKey:
                         type: string
-                    required:
-                    - kmsKeyID
-                    - sseAlgorithm
-                    - sseCustomerAlgorithm
-                    - sseCustomerKey
                     type: object
                   storageClass:
                     type: string

diff --git a/config/crd/bases/psmdb.percona.com_perconaservermongodbrestores.yaml b/config/crd/bases/psmdb.percona.com_perconaservermongodbrestores.yaml
@@ -101,11 +101,6 @@ spec:
                             type: string
                           sseCustomerKey:
                             type: string
-                        required:
-                        - kmsKeyID
-                        - sseAlgorithm
-                        - sseCustomerAlgorithm
-                        - sseCustomerKey
                         type: object
                       storageClass:
                         type: string

diff --git a/config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml b/config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml
@@ -268,11 +268,6 @@ spec:
                                   type: string
                                 sseCustomerKey:
                                   type: string
-                              required:
-                              - kmsKeyID
-                              - sseAlgorithm
-                              - sseCustomerAlgorithm
-                              - sseCustomerKey
                               type: object
                             storageClass:
                               type: string

diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -130,11 +130,6 @@ spec:
                         type: string
                       sseCustomerKey:
                         type: string
-                    required:
-                    - kmsKeyID
-                    - sseAlgorithm
-                    - sseCustomerAlgorithm
-                    - sseCustomerKey
                     type: object
                   storageClass:
                     type: string
@@ -261,11 +256,6 @@ spec:
                             type: string
                           sseCustomerKey:
                             type: string
-                        required:
-                        - kmsKeyID
-                        - sseAlgorithm
-                        - sseCustomerAlgorithm
-                        - sseCustomerKey
                         type: object
                       storageClass:
                         type: string
@@ -909,11 +899,6 @@ spec:
                                   type: string
                                 sseCustomerKey:
                                   type: string
-                              required:
-                              - kmsKeyID
-                              - sseAlgorithm
-                              - sseCustomerAlgorithm
-                              - sseCustomerKey
                               type: object
                             storageClass:
                               type: string
@@ -17464,10 +17449,13 @@ rules:
   resources:
   - perconaservermongodbs
   - perconaservermongodbs/status
+  - perconaservermongodbs/finalizers
   - perconaservermongodbbackups
   - perconaservermongodbbackups/status
+  - perconaservermongodbbackups/finalizers
   - perconaservermongodbrestores
   - perconaservermongodbrestores/status
+  - perconaservermongodbrestores/finalizers
   verbs:
   - get
   - list

diff --git a/deploy/cr-minimal.yaml b/deploy/cr-minimal.yaml
@@ -3,8 +3,8 @@ kind: PerconaServerMongoDB
 metadata:
   name: minimal-cluster
 spec:
-  crVersion: 1.15.0
-  image: percona/percona-server-mongodb:6.0.4-3
+  crVersion: 1.16.0
+  image: perconalab/percona-server-mongodb-operator:main-mongod6.0
   allowUnsafeConfigurations: true
   upgradeOptions:
     apply: disabled

diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -11,8 +11,8 @@ spec:
 #  clusterServiceDNSMode: "Internal"
 #  pause: true
 #  unmanaged: false
-  crVersion: 1.15.0
-  image: percona/percona-server-mongodb:6.0.4-3
+  crVersion: 1.16.0
+  image: perconalab/percona-server-mongodb-operator:main-mongod6.0
   imagePullPolicy: Always
 #  tls:
 #    # 90 days in hours
@@ -41,7 +41,7 @@ spec:
 #    vault: my-cluster-name-vault
   pmm:
     enabled: false
-    image: percona/pmm-client:2.35.0
+    image: perconalab/pmm-client:dev-latest
     serverHost: monitoring-service
 #    mongodParams: --environment=ENVIRONMENT
 #    mongosParams: --environment=ENVIRONMENT
@@ -519,7 +519,7 @@ spec:
 #          credentialsSecret: my-cluster-name-backup-s3
 #          serverSideEncryption:
 #            kmsKeyID: 1234abcd-12ab-34cd-56ef-1234567890ab
-#            sseAlgorithm: AES256
+#            sseAlgorithm: aws:kms
 #            sseCustomerAlgorithm: AES256
 #            sseCustomerKey: Y3VzdG9tZXIta2V5
 #          region: us-west-2

diff --git a/deploy/crd.yaml b/deploy/crd.yaml
@@ -130,11 +130,6 @@ spec:
                         type: string
                       sseCustomerKey:
                         type: string
-                    required:
-                    - kmsKeyID
-                    - sseAlgorithm
-                    - sseCustomerAlgorithm
-                    - sseCustomerKey
                     type: object
                   storageClass:
                     type: string
@@ -261,11 +256,6 @@ spec:
                             type: string
                           sseCustomerKey:
                             type: string
-                        required:
-                        - kmsKeyID
-                        - sseAlgorithm
-                        - sseCustomerAlgorithm
-                        - sseCustomerKey
                         type: object
                       storageClass:
                         type: string
@@ -909,11 +899,6 @@ spec:
                                   type: string
                                 sseCustomerKey:
                                   type: string
-                              required:
-                              - kmsKeyID
-                              - sseAlgorithm
-                              - sseCustomerAlgorithm
-                              - sseCustomerKey
                               type: object
                             storageClass:
                               type: string

diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -130,11 +130,6 @@ spec:
                         type: string
                       sseCustomerKey:
                         type: string
-                    required:
-                    - kmsKeyID
-                    - sseAlgorithm
-                    - sseCustomerAlgorithm
-                    - sseCustomerKey
                     type: object
                   storageClass:
                     type: string
@@ -261,11 +256,6 @@ spec:
                             type: string
                           sseCustomerKey:
                             type: string
-                        required:
-                        - kmsKeyID
-                        - sseAlgorithm
-                        - sseCustomerAlgorithm
-                        - sseCustomerKey
                         type: object
                       storageClass:
                         type: string
@@ -909,11 +899,6 @@ spec:
                                   type: string
                                 sseCustomerKey:
                                   type: string
-                              required:
-                              - kmsKeyID
-                              - sseAlgorithm
-                              - sseCustomerAlgorithm
-                              - sseCustomerKey
                               type: object
                             storageClass:
                               type: string
@@ -17464,10 +17449,13 @@ rules:
   resources:
   - perconaservermongodbs
   - perconaservermongodbs/status
+  - perconaservermongodbs/finalizers
   - perconaservermongodbbackups
   - perconaservermongodbbackups/status
+  - perconaservermongodbbackups/finalizers
   - perconaservermongodbrestores
   - perconaservermongodbrestores/status
+  - perconaservermongodbrestores/finalizers
   verbs:
   - get
   - list

diff --git a/deploy/cw-rbac.yaml b/deploy/cw-rbac.yaml
@@ -8,10 +8,13 @@ rules:
   resources:
   - perconaservermongodbs
   - perconaservermongodbs/status
+  - perconaservermongodbs/finalizers
   - perconaservermongodbbackups
   - perconaservermongodbbackups/status
+  - perconaservermongodbbackups/finalizers
   - perconaservermongodbrestores
   - perconaservermongodbrestores/status
+  - perconaservermongodbrestores/finalizers
   verbs:
   - get
   - list

diff --git a/deploy/rbac.yaml b/deploy/rbac.yaml
@@ -8,10 +8,13 @@ rules:
   resources:
   - perconaservermongodbs
   - perconaservermongodbs/status
+  - perconaservermongodbs/finalizers
   - perconaservermongodbbackups
   - perconaservermongodbbackups/status
+  - perconaservermongodbbackups/finalizers
   - perconaservermongodbrestores
   - perconaservermongodbrestores/status
+  - perconaservermongodbrestores/finalizers
   verbs:
   - get
   - list

diff --git a/e2e-tests/balancer/run b/e2e-tests/balancer/run
@@ -12,7 +12,7 @@ check_balancer() {
 
 	local balancer_running
 	balancer_running=$(run_mongos 'db.adminCommand({balancerStatus: 1}).mode' "clusterAdmin:clusterAdmin123456@$cluster-mongos.$namespace" \
-		| grep -E -v "Percona Server for MongoDB|connecting to:|Implicit session:|versions do not match|bye")
+		| grep -E -v "Percona Server for MongoDB|connecting to:|Implicit session:|versions do not match|Error saving history file:|bye")
 
 	if [[ $balancer_running != "$expected" ]]; then
 		echo "Unexpected output from \"db.adminCommand({balancerStatus: 1}).mode\": $balancer_running"

diff --git a/e2e-tests/conf/cmctl.yml b/e2e-tests/conf/cmctl.yml
@@ -15,14 +15,13 @@ spec:
       serviceAccountName: cmctl
       containers:
         - name: cmctl
-          image: debian
+          image: curlimages/curl
           imagePullPolicy: Always
           command:
-          - /bin/bash
+          - /bin/sh
           - -c
           - |
-            apt-get update && apt-get install -y curl \
-            && curl -fsSL -o cmctl.tar.gz https://github.com/cert-manager/cert-manager/releases/latest/download/cmctl-linux-amd64.tar.gz \
-            && tar xzf cmctl.tar.gz \
+            curl -fsSL -o /tmp/cmctl.tar.gz https://github.com/cert-manager/cert-manager/releases/latest/download/cmctl-linux-amd64.tar.gz \
+            && tar -C /tmp -xzf /tmp/cmctl.tar.gz \
             && sleep 100500
       restartPolicy: Always
diff --git a/e2e-tests/custom-replset-name/conf/backup-aws-s3.yml b/e2e-tests/custom-replset-name/conf/backup-aws-s3.yml
diff --git a/e2e-tests/custom-replset-name/conf/backup-gcp-cs.yml b/e2e-tests/custom-replset-name/conf/backup-gcp-cs.yml