Merge branch 'main' into K8SPG-532_add_logs

Author: nmarukovich

.github/workflows/reviewdog.yml

@@ -10,7 +10,7 @@ jobs:
           go-version: '^1.23'
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: latest
           only-new-issues: true

.golangci.next.yaml

@@ -10,7 +10,6 @@ linters:
   enable:
     - contextcheck
     - err113
-    - errchkjson
     - gocritic
     - godot
     - godox
@@ -28,13 +27,16 @@ linters:
     - wastedassign
 
 issues:
+  exclude-rules:
+    # We call external linters when they are installed: Flake8, ShellCheck, etc.
+    - linters: [gosec]
+      path: '_test[.]go$'
+      text: 'G204: Subprocess launched with variable'
+
   # https://github.com/golangci/golangci-lint/issues/2239
   exclude-use-default: false
 
 linters-settings:
-  errchkjson:
-    check-error-free-encoding: true
-
   thelper:
     # https://github.com/kulti/thelper/issues/27
     tb:   { begin: true, first: true }

.golangci.yaml

@@ -1,78 +1,119 @@
-# https://golangci-lint.run/usage/configuration/
-
+version: "2"
+run:
+  build-tags:
+    - envtest
 linters:
-  disable:
-    - contextcheck
-    - errchkjson
-    - gci
-    - gofumpt
-    - goimports
   enable:
+    - asasalint
+    - asciicheck
+    - bidichk
+    - bodyclose
     - depguard
+    - durationcheck
+    - errchkjson
+    - errorlint
+    - exhaustive
+    - gocheckcompilerdirectives
+    - gochecksumtype
     - gomodguard
-    - gosimple
+    - gosec
+    - gosmopolitan
     - importas
+    - loggercheck
+    - makezero
     - misspell
+    - musttag
+    - nilerr
+    - nilnesserr
+    - noctx
+    - protogetter
+    - reassign
+    - recvcheck
+    - rowserrcheck
+    - spancheck
+    - sqlclosecheck
+    - testifylint
     - unconvert
-  presets:
-    - bugs
-    - format
-    - unused
-
-linters-settings:
-  gci:
-    sections:
-      - standard
-      - default
-      - prefix(github.com/percona)
-
-  depguard:
+    - unparam
+    - zerologlint
+  disable:
+    - contextcheck
+  settings:
+    depguard:
+      rules:
+        everything:
+          deny:
+            - pkg: io/ioutil
+              desc: |
+                Use the "io" and "os" packages instead. See https://go.dev/doc/go1.16#ioutil
+        not-tests:
+          files:
+            - '!$test'
+          deny:
+            - pkg: net/http/httptest
+              desc: 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.
+        tests:
+          files:
+            - $test
+          deny:
+            - pkg: github.com/pkg/errors
+              desc: Use the "errors" package unless you are interacting with stack traces.
+    errchkjson:
+      check-error-free-encoding: true
+    exhaustive:
+      default-signifies-exhaustive: true
+    gomodguard:
+      blocked:
+        modules:
+          - gopkg.in/yaml.v2:
+              recommendations:
+                - sigs.k8s.io/yaml
+          - gopkg.in/yaml.v3:
+              recommendations:
+                - sigs.k8s.io/yaml
+          - gotest.tools:
+              recommendations:
+                - gotest.tools/v3
+          - k8s.io/kubernetes:
+              reason: |
+                k8s.io/kubernetes is for managing dependencies of the Kubernetes project, i.e. building kubelet and kubeadm.
+    importas:
+      alias:
+        - pkg: k8s.io/api/(\w+)/(v[\w\w]+)
+          alias: $1$2
+        - pkg: k8s.io/apimachinery/pkg/apis/(\w+)/(v[\w\d]+)
+          alias: $1$2
+      no-unaliased: true
+  exclusions:
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      everything:
-        deny:
-          - pkg: io/ioutil
-            desc: >
-              Use the "io" and "os" packages instead.
-              See https://go.dev/doc/go1.16#ioutil
-
-      not-tests:
-        files: ['!$test']
-        deny:
-          - pkg: net/http/httptest
-            desc: 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
-
-  gomodguard:
-    blocked:
-      modules:
-        - gopkg.in/yaml.v2: { recommendations: [sigs.k8s.io/yaml] }
-        - gopkg.in/yaml.v3: { recommendations: [sigs.k8s.io/yaml] }
-        - gotest.tools: { recommendations: [gotest.tools/v3] }
-        - k8s.io/kubernetes:
-            reason: >
-              k8s.io/kubernetes is for managing dependencies of the Kubernetes
-              project, i.e. building kubelet and kubeadm.
-
-  importas:
-    alias:
-      - pkg: k8s.io/api/(\w+)/(v[\w\w]+)
-        alias: $1$2
-      - pkg: k8s.io/apimachinery/pkg/apis/(\w+)/(v[\w\d]+)
-        alias: $1$2
-    no-unaliased: true
-
-run:
-  build-tags:
-    - envtest
-issues:
-  exclude-dirs:
-    - pkg/generated
-    - hack
+      - linters:
+          - recvcheck
+        path: internal/pki/pki.go
+        text: methods of "(Certificate|PrivateKey)"
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/percona)
+  exclusions:
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -9,9 +9,6 @@ PGMONITOR_DIR ?= hack/tools/pgmonitor
 PGMONITOR_VERSION ?= v4.11.0
 QUERIES_CONFIG_DIR ?= hack/tools/queries
 
-EXTERNAL_SNAPSHOTTER_DIR ?= hack/tools/external-snapshotter
-EXTERNAL_SNAPSHOTTER_VERSION ?= v8.0.1
-
 # Buildah's "build" used to be "bud". Use the alias to be compatible for a while.
 BUILDAH_BUILD ?= buildah bud
 
@@ -56,12 +53,6 @@ get-pgmonitor:
 	cp -r '$(PGMONITOR_DIR)/postgres_exporter/common/.' '${QUERIES_CONFIG_DIR}'
 	cp '$(PGMONITOR_DIR)/postgres_exporter/linux/queries_backrest.yml' '${QUERIES_CONFIG_DIR}'
 
-.PHONY: get-external-snapshotter
-get-external-snapshotter:
-	git -C '$(dir $(EXTERNAL_SNAPSHOTTER_DIR))' clone https://github.com/kubernetes-csi/external-snapshotter.git || git -C '$(EXTERNAL_SNAPSHOTTER_DIR)' fetch origin
-	@git -C '$(EXTERNAL_SNAPSHOTTER_DIR)' checkout '$(EXTERNAL_SNAPSHOTTER_VERSION)'
-	@git -C '$(EXTERNAL_SNAPSHOTTER_DIR)' config pull.ff only
-
 .PHONY: clean
 clean: ## Clean resources
 clean: clean-deprecated
@@ -209,7 +200,7 @@ check: get-pgmonitor
 check-envtest: ## Run check using envtest and a mock kube api
 check-envtest: ENVTEST_USE = hack/tools/setup-envtest --bin-dir=$(CURDIR)/hack/tools/envtest use $(ENVTEST_K8S_VERSION)
 check-envtest: SHELL = bash
-check-envtest: get-pgmonitor get-external-snapshotter
+check-envtest: get-pgmonitor tools/setup-envtest
 	GOBIN='$(CURDIR)/hack/tools' $(GO) install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 	@$(ENVTEST_USE) --print=overview && echo
 	source <($(ENVTEST_USE) --print=env) && PGO_NAMESPACE="postgres-operator" QUERIES_CONFIG_DIR="$(CURDIR)/${QUERIES_CONFIG_DIR}" \
@@ -221,7 +212,7 @@ check-envtest: get-pgmonitor get-external-snapshotter
 # make check-envtest-existing PGO_TEST_TIMEOUT_SCALE=1.2
 .PHONY: check-envtest-existing
 check-envtest-existing: ## Run check using envtest and an existing kube api
-check-envtest-existing: get-pgmonitor get-external-snapshotter
+check-envtest-existing: get-pgmonitor
 check-envtest-existing: createnamespaces
 	kubectl apply --server-side -k ./config/dev
 	USE_EXISTING_CLUSTER=true PGO_NAMESPACE="postgres-operator" QUERIES_CONFIG_DIR="$(CURDIR)/${QUERIES_CONFIG_DIR}" \