From b9ba934cae5f9d665d2956ddfeff2f03d71fda61 Mon Sep 17 00:00:00 2001 From: Jakob Schultz-Falk Date: Fri, 15 Dec 2023 11:01:45 +0100 Subject: [PATCH] Hardcode version of barman to reduce overhead - additional backoff exponential steps --- pkg/management/barman/capabilities/detect.go | 10 ++-------- pkg/management/client.go | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkg/management/barman/capabilities/detect.go b/pkg/management/barman/capabilities/detect.go index fd3b5f6c82..a30080fe1c 100644 --- a/pkg/management/barman/capabilities/detect.go +++ b/pkg/management/barman/capabilities/detect.go @@ -32,19 +32,13 @@ var capabilities *Capabilities // Detect barman-cloud executables presence and store the Capabilities // of the barman-cloud version it finds func Detect() (*Capabilities, error) { - version, err := getBarmanCloudVersion(BarmanCloudWalArchive) + version, err := semver.Parse("3.9.0") if err != nil { return nil, err } newCapabilities := new(Capabilities) - - if version == nil { - log.Info("Missing Barman Cloud installation in the operand image") - return newCapabilities, nil - } - - newCapabilities.Version = version + newCapabilities.Version = &version switch { case version.GE(semver.Version{Major: 3, Minor: 4}): diff --git a/pkg/management/client.go b/pkg/management/client.go index 78f3390083..0f4a092da4 100644 --- a/pkg/management/client.go +++ b/pkg/management/client.go @@ -48,7 +48,7 @@ var ( // readinessCheckRetry is used to wait until the API server is reachable readinessCheckRetry = wait.Backoff{ - Steps: 5, + Steps: 10, Duration: 10 * time.Millisecond, Factor: 5.0, Jitter: 0.1,