From 8c3fe7b6dc77acef5899233bc368fac3cb07fe22 Mon Sep 17 00:00:00 2001 From: anshajsingh <42251874+anshajsingh@users.noreply.github.com> Date: Thu, 10 Apr 2025 10:35:55 +0530 Subject: [PATCH 1/3] ability to configure timeout for backup-daemon --- charts/patroni-services/crds/qubership.org_patroniservices.yaml | 2 ++ charts/patroni-services/templates/cr.yaml | 1 + charts/patroni-services/values.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/charts/patroni-services/crds/qubership.org_patroniservices.yaml b/charts/patroni-services/crds/qubership.org_patroniservices.yaml index ad81c775..f1f2c5e8 100644 --- a/charts/patroni-services/crds/qubership.org_patroniservices.yaml +++ b/charts/patroni-services/crds/qubership.org_patroniservices.yaml @@ -1001,6 +1001,8 @@ spec: type: string jobFlag: type: string + connectTimeout: + type: string pgHost: type: string podLabels: diff --git a/charts/patroni-services/templates/cr.yaml b/charts/patroni-services/templates/cr.yaml index 4d39cf1b..1e48a1fb 100644 --- a/charts/patroni-services/templates/cr.yaml +++ b/charts/patroni-services/templates/cr.yaml @@ -62,6 +62,7 @@ spec: databasesToSchedule: {{ .Values.backupDaemon.databasesToSchedule }} {{- end }} jobFlag: {{ if .Values.backupDaemon.jobFlag }}{{ .Values.backupDaemon.jobFlag | squote }}{{ else }}'1'{{ end }} + connectTimeout: {{ default "5" .Values.backupDaemon.connectTimeout | squote }} backupSchedule: {{ if .Values.externalDataBase }}None{{ else }}{{ default "0 0/7 * * *" .Values.backupDaemon.backupSchedule }}{{ end }} evictionPolicy: {{ default "100m" .Values.backupDaemon.evictionPolicy }} pgHost: {{ include "backupDaemon.pgHost" . }} diff --git a/charts/patroni-services/values.yaml b/charts/patroni-services/values.yaml index 77fb0bb5..6c4ea141 100644 --- a/charts/patroni-services/values.yaml +++ b/charts/patroni-services/values.yaml @@ -185,6 +185,7 @@ backupDaemon: evictionPolicy: "7d/delete" granularEviction: "3600" # jobFlag: "2" + # connectTimeout: "30" allowPrefix: false useEvictionPolicyFirst: false evictionBinaryPolicy: "7d/delete" From a3b000f2fa6944d36db5e89e831ca64422eb0703 Mon Sep 17 00:00:00 2001 From: anshajsingh <42251874+anshajsingh@users.noreply.github.com> Date: Thu, 10 Apr 2025 13:28:52 +0530 Subject: [PATCH 2/3] ability to configure timeout for backup-daemon --- charts/patroni-services/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/patroni-services/values.yaml b/charts/patroni-services/values.yaml index 6c4ea141..0307ffdf 100644 --- a/charts/patroni-services/values.yaml +++ b/charts/patroni-services/values.yaml @@ -185,7 +185,7 @@ backupDaemon: evictionPolicy: "7d/delete" granularEviction: "3600" # jobFlag: "2" - # connectTimeout: "30" + # connectTimeout: "5" allowPrefix: false useEvictionPolicyFirst: false evictionBinaryPolicy: "7d/delete" From 25895761474da5cca71c567e3af840e162458a81 Mon Sep 17 00:00:00 2001 From: anshajsingh <42251874+anshajsingh@users.noreply.github.com> Date: Tue, 15 Apr 2025 15:26:36 +0530 Subject: [PATCH 3/3] new pg-operator-core dep --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fe19c6c9..8a3f2d7b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/Netcracker/pgskipper-operator go 1.22.5 require ( - github.com/Netcracker/pgskipper-operator-core v0.0.51 + github.com/Netcracker/pgskipper-operator-core v0.0.52 github.com/Netcracker/qubership-credential-manager v0.0.3 github.com/avast/retry-go/v4 v4.6.0 github.com/go-co-op/gocron v1.37.0 diff --git a/go.sum b/go.sum index abaff9a5..2c873ab5 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/Netcracker/pgskipper-operator-core v0.0.51 h1:q9UjVXw7T5ZzAkfFAv3eouUrvO7QGkF6CfJ3Fn3xPz8= -github.com/Netcracker/pgskipper-operator-core v0.0.51/go.mod h1:dfV3km1hTxmi6KAoKTdc7xBgSF1/NdFdqLSrQnHKq+Y= +github.com/Netcracker/pgskipper-operator-core v0.0.52 h1:Rzyd65lUJznB6O/hm6dZC88W8hk/q8W70V6YGWW1L5M= +github.com/Netcracker/pgskipper-operator-core v0.0.52/go.mod h1:dfV3km1hTxmi6KAoKTdc7xBgSF1/NdFdqLSrQnHKq+Y= github.com/Netcracker/qubership-credential-manager v0.0.3 h1:08QiT/wFo184ac39oabLz6JHALc0a4Qazmv9gN657ZU= github.com/Netcracker/qubership-credential-manager v0.0.3/go.mod h1:BAZvlOSDmZ25z8YFLXyI57OCZ63MdQPtGq0/vmiTjuQ= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=