From b5b59c8b620ae70d6c4568f6004c41b53357dc64 Mon Sep 17 00:00:00 2001 From: souravbiswassanto Date: Tue, 10 Dec 2024 18:13:41 +0600 Subject: [PATCH 1/2] Set Default Postgres StandbyMode Signed-off-by: souravbiswassanto --- apis/kubedb/v1/postgres_helpers.go | 5 ++++- apis/kubedb/v1alpha2/postgres_helpers.go | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apis/kubedb/v1/postgres_helpers.go b/apis/kubedb/v1/postgres_helpers.go index 956de9e547..9a2c782ea2 100644 --- a/apis/kubedb/v1/postgres_helpers.go +++ b/apis/kubedb/v1/postgres_helpers.go @@ -24,6 +24,7 @@ import ( "kubedb.dev/apimachinery/apis" catalog "kubedb.dev/apimachinery/apis/catalog/v1alpha1" "kubedb.dev/apimachinery/apis/kubedb" + dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2" "kubedb.dev/apimachinery/crds" "github.com/Masterminds/semver/v3" @@ -199,7 +200,9 @@ func (p *Postgres) SetDefaults(postgresVersion *catalog.PostgresVersion) { if p == nil { return } - + if p.Spec.StandbyMode == nil { + p.Spec.StandbyMode = ptr.To(PostgresStandbyMode(dbapi.HotPostgresStandbyMode)) + } if p.Spec.StorageType == "" { p.Spec.StorageType = StorageTypeDurable } diff --git a/apis/kubedb/v1alpha2/postgres_helpers.go b/apis/kubedb/v1alpha2/postgres_helpers.go index dc73b64655..e49af457c6 100644 --- a/apis/kubedb/v1alpha2/postgres_helpers.go +++ b/apis/kubedb/v1alpha2/postgres_helpers.go @@ -24,6 +24,7 @@ import ( "kubedb.dev/apimachinery/apis" catalog "kubedb.dev/apimachinery/apis/catalog/v1alpha1" "kubedb.dev/apimachinery/apis/kubedb" + dbapi "kubedb.dev/apimachinery/apis/kubedb/v1" "kubedb.dev/apimachinery/crds" "github.com/Masterminds/semver/v3" @@ -189,6 +190,9 @@ func (p *Postgres) SetDefaults(postgresVersion *catalog.PostgresVersion, topolog if p == nil { return } + if p.Spec.StandbyMode == nil { + p.Spec.StandbyMode = ptr.To(PostgresStandbyMode(dbapi.HotPostgresStandbyMode)) + } if p.Spec.StorageType == "" { p.Spec.StorageType = StorageTypeDurable From 67ef4b53307567f51ff38a5ac8d314a8ded8dc94 Mon Sep 17 00:00:00 2001 From: souravbiswassanto Date: Tue, 10 Dec 2024 18:24:58 +0600 Subject: [PATCH 2/2] wip Signed-off-by: souravbiswassanto --- apis/kubedb/v1/postgres_helpers.go | 3 +-- apis/kubedb/v1alpha2/postgres_helpers.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apis/kubedb/v1/postgres_helpers.go b/apis/kubedb/v1/postgres_helpers.go index 9a2c782ea2..81857ce6b9 100644 --- a/apis/kubedb/v1/postgres_helpers.go +++ b/apis/kubedb/v1/postgres_helpers.go @@ -24,7 +24,6 @@ import ( "kubedb.dev/apimachinery/apis" catalog "kubedb.dev/apimachinery/apis/catalog/v1alpha1" "kubedb.dev/apimachinery/apis/kubedb" - dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2" "kubedb.dev/apimachinery/crds" "github.com/Masterminds/semver/v3" @@ -201,7 +200,7 @@ func (p *Postgres) SetDefaults(postgresVersion *catalog.PostgresVersion) { return } if p.Spec.StandbyMode == nil { - p.Spec.StandbyMode = ptr.To(PostgresStandbyMode(dbapi.HotPostgresStandbyMode)) + p.Spec.StandbyMode = ptr.To(HotPostgresStandbyMode) } if p.Spec.StorageType == "" { p.Spec.StorageType = StorageTypeDurable diff --git a/apis/kubedb/v1alpha2/postgres_helpers.go b/apis/kubedb/v1alpha2/postgres_helpers.go index e49af457c6..25551b81c6 100644 --- a/apis/kubedb/v1alpha2/postgres_helpers.go +++ b/apis/kubedb/v1alpha2/postgres_helpers.go @@ -24,7 +24,6 @@ import ( "kubedb.dev/apimachinery/apis" catalog "kubedb.dev/apimachinery/apis/catalog/v1alpha1" "kubedb.dev/apimachinery/apis/kubedb" - dbapi "kubedb.dev/apimachinery/apis/kubedb/v1" "kubedb.dev/apimachinery/crds" "github.com/Masterminds/semver/v3" @@ -191,7 +190,7 @@ func (p *Postgres) SetDefaults(postgresVersion *catalog.PostgresVersion, topolog return } if p.Spec.StandbyMode == nil { - p.Spec.StandbyMode = ptr.To(PostgresStandbyMode(dbapi.HotPostgresStandbyMode)) + p.Spec.StandbyMode = ptr.To(HotPostgresStandbyMode) } if p.Spec.StorageType == "" {