K8SPG-437: merge upstream 5.4.2 changes

.github/workflows/test.yml

@@ -12,5 +12,7 @@ jobs:
         with:
           go-version: '^1.20'
       - uses: actions/checkout@v3
+      - name: Basic tests
+        run: make check 
       - name: envtest
-        run: ENVTEST_K8S_VERSION=1.22 make check
+        run: ENVTEST_K8S_VERSION=1.22 make check-envtest

.golangci.yaml

@@ -7,8 +7,8 @@ linters:
     - gci
     - gofumpt
     - scopelint
-    - depguard
   enable:
+    - depguard
     - gomodguard
     - gosimple
     - importas
@@ -28,21 +28,24 @@ linters-settings:
 
   depguard:
     rules:
-      main:
-        allow:
-          - $gostd
-          - github.com/OpenPeeDeeP
-    include-go-root: true
-    packages-with-error-message:
-      - io/ioutil: >
-          Use the "io" and "os" packages instead.
-          See https://go.dev/doc/go1.16#ioutil
+      everything:
+        deny:
+          - pkg: io/ioutil
+            desc: >
+              Use the "io" and "os" packages instead.
+              See https://go.dev/doc/go1.16#ioutil
 
-      - net/http/httptest: Should be used only in tests.
-      - testing/*: The "testing" packages should be used only in tests.
+      not-tests:
+        files: ['!$test']
+        deny:
+          - pkg: net/http/httptest
+            desc: Should be used only in tests.
 
-      - github.com/percona/percona-postgresql-operator/internal/testing/*: >
-          The "internal/testing" packages should be used only in tests.
+          - pkg: testing/*
+            desc: The "testing" packages should be used only in tests.
+
+          - pkg: github.com/percona/percona-postgresql-operator/internal/testing/*
+            desc: The "internal/testing" packages should be used only in tests.
 
   exhaustive:
     default-signifies-exhaustive: true
@@ -71,14 +74,6 @@ linters-settings:
         alias: k8serrors
     no-unaliased: true
 
-issues:
-  exclude-rules:
-    # These testing packages are allowed in test files. The packages are
-    # disallowed everywhere then ignored here because that is how depguard works.
-    - linters: [depguard]
-      path: _test[.]go$
-      text: \`(net/http/httptest|[^`]*testing[^`]*)`
-
 run:
   build-tags:
     - envtest

CONTRIBUTING.md

@@ -54,4 +54,4 @@ See the [Documentation Contribution Guide](https://github.com/percona/k8spg-docs
 
 ## Code review
 
-Your contribution will be reviewed by other developers contributing to the project. The more complex your changes are, the more experts will be involved. You will receive feedback and recommendations directly on your pull request on GitHub, so keep an eye on your submission and be prepared to make further amendments. The developers might even provide some concrete suggestions on modifying your code to match the project’s expectations better.
+Your contribution will be reviewed by other developers contributing to the project. The more complex your changes are, the more experts will be involved. You will receive feedback and recommendations directly on your pull request on GitHub, so keep an eye on your submission and be prepared to make further amendments. The developers might even provide some concrete suggestions on modifying your code to match the project’s expectations better.