Merge branch 'main' into k8s-cloud-versions-update

EnterpriseDB · May 14, 2024 · b57b738 · b57b738
2 parents 34c056b + 63e0b4c
commit b57b738
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 17 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,5 +4,5 @@ contact_links:
     url: https://github.com/cloudnative-pg/cloudnative-pg/discussions
     about: Please ask and answer questions here.
   - name: Slack chat
-    url: https://join.slack.com/t/cloudnativepg/shared_invite/zt-237bhehx3-htDW2kz2hKJxEhn1W4VTnw
+    url: https://join.slack.com/t/cloudnativepg/shared_invite/zt-2ij5hagfo-B04EQ9DUlGFzD6GEHDqE0g
     about: Please join the slack channel and interact with our community
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ For development contributions, please refer to the separate section called
 ## Ask for Help
 
 The best way to reach us with a question when contributing is to drop a line in
-our [Slack channel](https://join.slack.com/t/cloudnativepg/shared_invite/zt-237bhehx3-htDW2kz2hKJxEhn1W4VTnw), or
+our [Slack channel](https://join.slack.com/t/cloudnativepg/shared_invite/zt-2ij5hagfo-B04EQ9DUlGFzD6GEHDqE0g), or
 start a new Github discussion.
 
 ## Raising Issues

diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ LOCALBIN ?= $(shell pwd)/bin
 BUILD_IMAGE ?= true
 POSTGRES_IMAGE_NAME ?= $(shell grep 'DefaultImageName.*=' "pkg/versions/versions.go" | cut -f 2 -d \")
 KUSTOMIZE_VERSION ?= v5.4.1
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
+CONTROLLER_TOOLS_VERSION ?= v0.15.0
 GORELEASER_VERSION ?= v1.25.1
 SPELLCHECK_VERSION ?= 0.36.0
 WOKE_VERSION ?= 0.19.0
@@ -234,10 +234,10 @@ shellcheck: ## Shellcheck for the hack directory.
 	}
 
 spellcheck: ## Runs the spellcheck on the project.
-	docker run --rm -v $(PWD):/tmp jonasbn/github-action-spellcheck:$(SPELLCHECK_VERSION)
+	docker run --rm -v $(PWD):/tmp:Z jonasbn/github-action-spellcheck:$(SPELLCHECK_VERSION)
 
 woke: ## Runs the woke checks on project.
-	docker run --rm -v $(PWD):/src -w /src getwoke/woke:$(WOKE_VERSION) woke -c .woke.yaml
+	docker run --rm -v $(PWD):/src:Z -w /src getwoke/woke:$(WOKE_VERSION) woke -c .woke.yaml
 
 wordlist-ordered: ## Order the wordlist using sort
 	LANG=C LC_ALL=C sort .wordlist-en-custom.txt > .wordlist-en-custom.txt.new && \

diff --git a/README.md b/README.md
@@ -111,7 +111,7 @@ MariaDB cluster).
 
 ## Communications
 
-- [Slack Channel](https://join.slack.com/t/cloudnativepg/shared_invite/zt-237bhehx3-htDW2kz2hKJxEhn1W4VTnw)
+- [Slack Channel](https://join.slack.com/t/cloudnativepg/shared_invite/zt-2ij5hagfo-B04EQ9DUlGFzD6GEHDqE0g)
 - [Github Discussions](https://github.com/cloudnative-pg/cloudnative-pg/discussions)
 - [Twitter](https://twitter.com/CloudNativePg)
 

diff --git a/config/crd/bases/postgresql.cnpg.io_backups.yaml b/config/crd/bases/postgresql.cnpg.io_backups.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: backups.postgresql.cnpg.io
 spec:
   group: postgresql.cnpg.io

diff --git a/config/crd/bases/postgresql.cnpg.io_clusterimagecatalogs.yaml b/config/crd/bases/postgresql.cnpg.io_clusterimagecatalogs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: clusterimagecatalogs.postgresql.cnpg.io
 spec:
   group: postgresql.cnpg.io

diff --git a/config/crd/bases/postgresql.cnpg.io_clusters.yaml b/config/crd/bases/postgresql.cnpg.io_clusters.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: clusters.postgresql.cnpg.io
 spec:
   group: postgresql.cnpg.io

diff --git a/config/crd/bases/postgresql.cnpg.io_imagecatalogs.yaml b/config/crd/bases/postgresql.cnpg.io_imagecatalogs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: imagecatalogs.postgresql.cnpg.io
 spec:
   group: postgresql.cnpg.io

diff --git a/config/crd/bases/postgresql.cnpg.io_poolers.yaml b/config/crd/bases/postgresql.cnpg.io_poolers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: poolers.postgresql.cnpg.io
 spec:
   group: postgresql.cnpg.io

diff --git a/config/crd/bases/postgresql.cnpg.io_scheduledbackups.yaml b/config/crd/bases/postgresql.cnpg.io_scheduledbackups.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: scheduledbackups.postgresql.cnpg.io
 spec:
   group: postgresql.cnpg.io

diff --git a/tests/e2e/fixtures/base/cluster-storage-class-with-rep-slots.yaml.template b/tests/e2e/fixtures/base/cluster-storage-class-with-rep-slots.yaml.template
@@ -9,7 +9,7 @@ spec:
     parameters:
       log_checkpoints: "on"
       log_lock_waits: "on"
-      log_min_duration_statement: '0'
+      log_min_duration_statement: '1000'
       log_temp_files: '1024'
       log_autovacuum_min_duration: '1s'
       log_replication_commands: 'on'

diff --git a/tests/e2e/fixtures/fastfailover/cluster-fast-failover-with-repl-slots.yaml.template b/tests/e2e/fixtures/fastfailover/cluster-fast-failover-with-repl-slots.yaml.template
@@ -11,7 +11,7 @@ spec:
     parameters:
       log_checkpoints: "on"
       log_lock_waits: "on"
-      log_min_duration_statement: '0'
+      log_min_duration_statement: '1000'
       log_temp_files: '1024'
       log_autovacuum_min_duration: '1s'
       log_replication_commands: 'on'

diff --git a/tests/e2e/fixtures/fastfailover/cluster-syncreplicas-fast-failover.yaml.template b/tests/e2e/fixtures/fastfailover/cluster-syncreplicas-fast-failover.yaml.template
@@ -18,6 +18,7 @@ spec:
       log_temp_files: '1024'
       log_autovacuum_min_duration: '1s'
       log_replication_commands: 'on'
+      wal_retrieve_retry_interval: '2s'
   bootstrap:
     initdb:
       database: app

diff --git a/tests/e2e/fixtures/fastswitchover/cluster-fast-switchover-with-repl-slots.yaml.template b/tests/e2e/fixtures/fastswitchover/cluster-fast-switchover-with-repl-slots.yaml.template
@@ -10,7 +10,7 @@ spec:
     parameters:
       log_checkpoints: "on"
       log_lock_waits: "on"
-      log_min_duration_statement: '0'
+      log_min_duration_statement: '1000'
       log_temp_files: '1024'
       log_autovacuum_min_duration: '1s'
       log_replication_commands: 'on'

diff --git a/tests/e2e/fixtures/replication_slot/cluster-pg-replication-slot-disable.yaml.template b/tests/e2e/fixtures/replication_slot/cluster-pg-replication-slot-disable.yaml.template
@@ -9,7 +9,7 @@ spec:
     parameters:
       log_checkpoints: "on"
       log_lock_waits: "on"
-      log_min_duration_statement: '0'
+      log_min_duration_statement: '1000'
       log_temp_files: '1024'
       log_autovacuum_min_duration: '1s'
       log_replication_commands: 'on'

diff --git a/tests/e2e/fixtures/switchover/cluster-switchover-with-rep-slots.yaml.template b/tests/e2e/fixtures/switchover/cluster-switchover-with-rep-slots.yaml.template
@@ -9,7 +9,7 @@ spec:
     parameters:
       log_checkpoints: "on"
       log_lock_waits: "on"
-      log_min_duration_statement: '0'
+      log_min_duration_statement: '1000'
       log_temp_files: '1024'
       log_autovacuum_min_duration: '1s'
       log_replication_commands: 'on'