Merge branch 'main' into release-1.19.1

Author: eleo007

.e2eignore

@@ -7,4 +7,5 @@ README.md
 LICENSE
 operator.png
 kubernetes.svg
-release_versions
+release_versions
+.github/**

.github/CODEOWNERS

@@ -1,3 +1,4 @@
-* @hors @egegunes @inelpandzic @pooknull
-/e2e-tests/ @nmarukovich @ptankov @jvpasinatto @eleo007
-Jenkinsfile @nmarukovich @ptankov @jvpasinatto @eleo007
+* @hors @egegunes @pooknull @nmarukovich @gkech
+/e2e-tests/ @ptankov @jvpasinatto @eleo007
+Jenkinsfile @ptankov @jvpasinatto @eleo007
+

.github/dependabot.yml

@@ -23,7 +23,7 @@ updates:
       time: "01:00"
     reviewers:
       - hors
-      - tplavcic
+      - nmarukovich
     ignore:
       # ignore patch updates for all dependencies
       - dependency-name: "*"

.gitignore

@@ -92,6 +92,9 @@ anaconda-mode/
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
+# vendor
+/vendor/
+
 ### Vim ###
 # swap
 .sw[a-p]
@@ -182,3 +185,7 @@ bin/
 ### VisualStudioCode ###
 .vscode/*
 .history
+
+projects/
+installers/olm/operator_*.yaml
+installers/olm/bundles

Jenkinsfile

@@ -13,7 +13,7 @@ void createCluster(String CLUSTER_SUFFIX) {
                 gcloud auth activate-service-account --key-file $CLIENT_SECRET_FILE
                 gcloud config set project $GCP_PROJECT
                 gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true
-                gcloud container clusters create --zone $region $CLUSTER_NAME-${CLUSTER_SUFFIX} --cluster-version=1.28 --machine-type=n1-standard-4 --preemptible --disk-size 30 --num-nodes=\$NODES_NUM --network=jenkins-vpc --subnetwork=jenkins-${CLUSTER_SUFFIX} --no-enable-autoupgrade --cluster-ipv4-cidr=/21 --labels delete-cluster-after-hours=6 --enable-ip-alias --workload-pool=cloud-dev-112233.svc.id.goog && \
+                gcloud container clusters create --zone $region $CLUSTER_NAME-${CLUSTER_SUFFIX} --cluster-version=1.29 --machine-type=n1-standard-4 --preemptible --disk-size 30 --num-nodes=\$NODES_NUM --network=jenkins-vpc --subnetwork=jenkins-${CLUSTER_SUFFIX} --no-enable-autoupgrade --cluster-ipv4-cidr=/21 --labels delete-cluster-after-hours=6 --enable-ip-alias --workload-pool=cloud-dev-112233.svc.id.goog && \
                 kubectl create clusterrolebinding cluster-admin-binding --clusterrole cluster-admin --user jenkins@"$GCP_PROJECT".iam.gserviceaccount.com || ret_val=\$?
                 if [ \${ret_val} -eq 0 ]; then break; fi
                 ret_num=\$((ret_num + 1))
@@ -280,58 +280,65 @@ void checkE2EIgnoreFiles() {
     }
 
     def e2eignoreFile = ".e2eignore"
-    if (fileExists(e2eignoreFile)) {
-        def excludedFiles = readFile(e2eignoreFile).split('\n').collect{it.trim()}
-        def lastProcessedCommitFile="last-processed-commit.txt"
-        def lastProcessedCommitHash = ""
-
-        def build = currentBuild.previousBuild
-        while (build != null) {
-            try {
-                echo "Checking previous build: #$build.number"
-                copyArtifacts(projectName: env.JOB_NAME, selector: specific("$build.number"), filter: lastProcessedCommitFile)
-                lastProcessedCommitHash = readFile(lastProcessedCommitFile).trim()
-                echo "Last processed commit hash: $lastProcessedCommitHash"
-                break
-            } catch (Exception e) {
-                echo "No $lastProcessedCommitFile found in build $build.number. Checking earlier builds."
-            }
-            build = build.previousBuild
+    if ( ! fileExists(e2eignoreFile) ) {
+        echo "No $e2eignoreFile file found. Proceeding with execution."
+        return
+    }
+
+    def excludedFiles = readFile(e2eignoreFile).split('\n').collect{it.trim()}
+    def lastProcessedCommitFile = "last-processed-commit.txt"
+    def lastProcessedCommitHash = ""
+
+    def build = currentBuild.previousBuild
+    while (build != null) {
+        try {
+            echo "Checking previous build: #$build.number"
+            copyArtifacts(projectName: env.JOB_NAME, selector: specific("$build.number"), filter: lastProcessedCommitFile)
+            lastProcessedCommitHash = readFile(lastProcessedCommitFile).trim()
+            echo "Last processed commit hash: $lastProcessedCommitHash"
+            break
+        } catch (Exception e) {
+            echo "No $lastProcessedCommitFile found in build $build.number. Checking earlier builds."
         }
+        build = build.previousBuild
+    }
 
-        if (lastProcessedCommitHash == "") {
-            echo "This is the first run. Using merge base as the starting point for the diff."
-            changedFiles = sh(script: "git diff --name-only \$(git merge-base HEAD origin/$CHANGE_TARGET)", returnStdout: true).trim().split('\n').findAll{it}
-        } else {
+    if (lastProcessedCommitHash == "") {
+        echo "This is the first run. Using merge base as the starting point for the diff."
+        changedFiles = sh(script: "git diff --name-only \$(git merge-base HEAD origin/$CHANGE_TARGET)", returnStdout: true).trim().split('\n').findAll{it}
+    } else {
+        def commitExists = sh(script: "git cat-file -e $lastProcessedCommitHash 2>/dev/null", returnStatus: true) == 0
+        if (commitExists) {
             echo "Processing changes since last processed commit: $lastProcessedCommitHash"
             changedFiles = sh(script: "git diff --name-only $lastProcessedCommitHash HEAD", returnStdout: true).trim().split('\n').findAll{it}
+        } else {
+            echo "Commit hash $lastProcessedCommitHash does not exist in the current repository. Using merge base as the starting point for the diff."
+            changedFiles = sh(script: "git diff --name-only \$(git merge-base HEAD origin/$CHANGE_TARGET)", returnStdout: true).trim().split('\n').findAll{it}
         }
+    }
 
-        echo "Excluded files: $excludedFiles"
-        echo "Changed files: $changedFiles"
+    echo "Excluded files: $excludedFiles"
+    echo "Changed files: $changedFiles"
 
-        def excludedFilesRegex = excludedFiles.collect{it.replace("**", ".*").replace("*", "[^/]*")}
-        needToRunTests = !changedFiles.every{changed -> excludedFilesRegex.any{regex -> changed ==~ regex}}
+    def excludedFilesRegex = excludedFiles.collect{it.replace("**", ".*").replace("*", "[^/]*")}
+    needToRunTests = !changedFiles.every{changed -> excludedFilesRegex.any{regex -> changed ==~ regex}}
 
-        if (needToRunTests) {
-            echo "Some changed files are outside of the e2eignore list. Proceeding with execution."
+    if (needToRunTests) {
+        echo "Some changed files are outside of the e2eignore list. Proceeding with execution."
+    } else {
+        if (currentBuild.previousBuild?.result != 'SUCCESS') {
+            echo "All changed files are e2eignore files, and previous build was unsuccessful. Propagating previous state."
+            currentBuild.result = currentBuild.previousBuild?.result
+            error "Skipping execution as non-significant changes detected and previous build was unsuccessful."
         } else {
-            if (currentBuild.previousBuild?.result in ['FAILURE', 'ABORTED', 'UNSTABLE']) {
-                echo "All changed files are e2eignore files, and previous build was unsuccessful. Propagating previous state."
-                currentBuild.result = currentBuild.previousBuild?.result
-                error "Skipping execution as non-significant changes detected and previous build was unsuccessful."
-            } else {
-                echo "All changed files are e2eignore files. Aborting pipeline execution."
-            }
+            echo "All changed files are e2eignore files. Aborting pipeline execution."
         }
-
-        sh """
-            echo \$(git rev-parse HEAD) > $lastProcessedCommitFile
-        """
-        archiveArtifacts "$lastProcessedCommitFile"
-    } else {
-        echo "No $e2eignoreFile file found. Proceeding with execution."
     }
+
+    sh """
+        echo \$(git rev-parse HEAD) > $lastProcessedCommitFile
+    """
+    archiveArtifacts "$lastProcessedCommitFile"
 }
 
 def isPRJob = false

README.md

@@ -44,7 +44,7 @@ Below is one of the ways to deploy the Operator using `kubectl`.
 kubectl apply --server-side -f https://raw.githubusercontent.com/percona/percona-server-mongodb-operator/main/deploy/bundle.yaml
 ```
 
-2. Deploy the database cluster itself from `deploy/cr.yaml
+2. Deploy the database cluster itself from `deploy/cr.yaml`
 
 ```sh
 kubectl apply -f https://raw.githubusercontent.com/percona/percona-server-mongodb-operator/main/deploy/cr-minimal.yaml

config/bundle/kustomization.yaml

@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../crd
+- ../rbac/namespace
+- ../manager/namespace
+images:
+- name: percona-server-mongodb-operator
+  newName: perconalab/percona-server-mongodb-operator
+  newTag: main

config/community/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- ../operator

config/crd/kustomization.yaml

@@ -7,7 +7,7 @@ resources:
 - bases/psmdb.percona.com_perconaservermongodbs.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
-patchesJson6902:
+patches:
   - path: patches/deprecated-1.2.json
     target:
       name: perconaservermongodbs.psmdb.percona.com

config/manager/cluster/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- cw-operator.yaml
+images:
+- name: psmdb-operator
+  newName: perconalab/percona-server-mongodb-operator
+  newTag: main