Resolve conflicts

Author: Tvion

Makefile

@@ -35,6 +35,7 @@ gzip-charts:
 	gzip -f -c ./charts/patroni-services/monitoring/cloudsql-grafana-dashboard.json > ./charts/patroni-services/monitoring/cloudsql-grafana-dashboard.json.gz
 	gzip -f -c ./charts/patroni-services/monitoring/postgres-exporter-grafana-dashboard.json > ./charts/patroni-services/monitoring/postgres-exporter-grafana-dashboard.json.gz
 	gzip -f -c ./charts/patroni-services/monitoring/query-exporter-grafana-dashboard.json > ./charts/patroni-services/monitoring/query-exporter-grafana-dashboard.json.gz
+	gzip -f -c ./charts/patroni-services/monitoring/pgbackrest-exporter-grafana-dashboard.json > ./charts/patroni-services/monitoring/pgbackrest-exporter-grafana-dashboard.json.gz
 
 move-charts:
 	@echo "Move helm charts"
@@ -83,7 +84,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen

api/apps/v1/groupversion_info.go

@@ -14,7 +14,7 @@
 
 // Package v1 contains API Schema definitions for the  v1 API group
 // +kubebuilder:object:generate=true
-// +groupName=qubership.org
+// +groupName=netcracker.com
 package v1
 
 import (
@@ -24,7 +24,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "qubership.org", Version: "v1"}
+	GroupVersion = schema.GroupVersion{Group: "netcracker.com", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

api/apps/v1/postgresservice_types.go

@@ -41,8 +41,10 @@ type PatroniServicesSpec struct {
 	QueryExporter         QueryExporter          `json:"queryExporter,omitempty"`
 	Tls                   *Tls                   `json:"tls,omitempty"`
 	PgBackRest            *PgBackRest            `json:"pgBackRest,omitempty"`
+	PgBackRestExporter    *PgBackRestExporter    `json:"pgBackRestExporter,omitempty"`
 	InstallationTimestamp string                 `json:"installationTimestamp,omitempty"`
 	PrivateRegistry       PrivateRegistry        `json:"privateRegistry,omitempty"`
+	ImagePullPolicy       v1.PullPolicy          `json:"imagePullPolicy,omitempty"`
 }
 
 type PrivateRegistry struct {
@@ -232,16 +234,20 @@ type Tls struct {
 }
 
 type PgBackRest struct {
-	DockerImage       string         `json:"dockerImage,omitempty"`
-	RepoType          string         `json:"repoType,omitempty"`
-	RepoPath          string         `json:"repoPath,omitempty"`
-	DiffSchedule      string         `json:"diffSchedule,omitempty"`
-	IncrSchedule      string         `json:"incrSchedule,omitempty"`
-	S3                S3             `json:"s3,omitempty"`
-	Rwx               *types.Storage `json:"rwx,omitempty"`
-	BackupFromStandby bool           `json:"backupFromStandby,omitempty"`
+	DiffSchedule      string `json:"diffSchedule,omitempty"`
+	IncrSchedule      string `json:"incrSchedule,omitempty"`
+	BackupFromStandby bool   `json:"backupFromStandby,omitempty"`
 }
 
+type PgBackRestExporter struct {
+	Install         bool                    `json:"install,omitempty"`
+	Image           string                  `json:"image,omitempty"`
+	Resources       v1.ResourceRequirements `json:"resources,omitempty"`
+	SecurityContext *v1.PodSecurityContext  `json:"securityContext,omitempty"`
+	Affinity        v1.Affinity             `json:"affinity,omitempty"`
+	PodLabels       map[string]string       `json:"podLabels,omitempty"`
+	Env             map[string]string       `json:"env,omitempty"`
+}
 type S3 struct {
 	Bucket    string `json:"bucket,omitempty"`
 	Endpoint  string `json:"endpoint,omitempty"`

api/apps/v1/zz_generated.deepcopy.go

@@ -14,7 +14,7 @@
 
 // Package v1 contains API Schema definitions for the  v1 API group
 // +kubebuilder:object:generate=true
-// +groupName=qubership.org
+// +groupName=netcracker.com
 package v1
 
 import (
@@ -24,7 +24,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "qubership.org", Version: "v1"}
+	GroupVersion = schema.GroupVersion{Group: "netcracker.com", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

api/patroni/v1/groupversion_info.go

@@ -35,6 +35,7 @@ type PatroniCoreSpec struct {
 	Ldap                  *LdapConfig         `json:"ldap,omitempty"`
 	InstallationTimestamp string              `json:"installationTimestamp,omitempty"`
 	PrivateRegistry       PrivateRegistry     `json:"privateRegistry,omitempty"`
+	ImagePullPolicy       v1.PullPolicy       `json:"imagePullPolicy,omitempty"`
 }
 
 type PrivateRegistry struct {
@@ -109,6 +110,7 @@ type Patroni struct {
 	External                     *External                `json:"external,omitempty"`
 	PodAnnotations               map[string]string        `json:"podAnnotations,omitempty"`
 	ConfigMapAnnotations         map[string]string        `json:"configMapAnnotations,omitempty"`
+	PatroniResourcesLimitMemory  string                   `json:"patroniResourcesLimitMemory,omitempty"`
 }
 
 type External struct {
@@ -208,6 +210,7 @@ type PgBackRest struct {
 	DiffSchedule      string                   `json:"diffSchedule,omitempty"`
 	IncrSchedule      string                   `json:"incrSchedule,omitempty"`
 	S3                S3                       `json:"s3,omitempty"`
+	DRS3              S3                       `json:"drS3,omitempty"`
 	Rwx               *types.Storage           `json:"rwx,omitempty"`
 	Resources         *v1.ResourceRequirements `json:"resources,omitempty"`
 	FullRetention     int                      `json:"fullRetention,omitempty"`

api/patroni/v1/patronicore_types.go

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.23-alpine3.20 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.25-alpine3.22 AS builder
 
 WORKDIR /workspace
 
@@ -16,7 +16,7 @@ ARG TARGETOS TARGETARCH
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o ./build/_output/bin/postgres-operator \
     -gcflags all=-trimpath=${GOPATH} -asmflags all=-trimpath=${GOPATH} ./cmd/pgskipper-operator
 
-FROM alpine:3.20.3
+FROM alpine:3.22
 
 ENV OPERATOR=/usr/local/bin/postgres-operator \
     USER_UID=1001 \

api/patroni/v1/zz_generated.deepcopy.go

@@ -88,18 +88,16 @@ BEGIN
 	CREATE TEMPORARY TABLE pg_patroni_service_slot_cleaner_passwd_output (tt_id serial PRIMARY KEY NOT NULL, command_output text );
 	COPY pg_patroni_service_slot_cleaner_passwd_output (command_output) FROM PROGRAM 'strings /proc/1/environ | sed -n "s/^PG_ROOT_PASSWORD=\(.*\)/\1/p"';
 
-	-- get current wal_keep_segments value and determine allowed_slot_delay
+	-- get current wal_keep_size value and determine allowed_slot_delay
 	IF ud_allowed_slot_delay < 0 THEN
-		SELECT INTO allowed_slot_delay setting FROM pg_settings where name='wal_keep_segments';
+    SELECT setting::integer INTO allowed_slot_delay FROM pg_settings where name='wal_keep_size';
 	ELSE
 		allowed_slot_delay = ud_allowed_slot_delay;
 	END IF;
 
 	-- check if we have pg_xlog_location_diff or not (postgresql 9.6 vs postgresql 10)
 	select into use_old_cmp_function exists(select * from pg_proc where proname = 'pg_xlog_location_diff');
 
-	--todo[anin] 16Mb size per WAL file is used. Honest calculation should get value from pg_settings
-	allowed_slot_delay := allowed_slot_delay * 16 ;
 	RAISE NOTICE 'allowed_slot_delay: % Mb', allowed_slot_delay;
 
 	-- perform slot cleanup for each active replica