From 60b1b2fa17f49fdef9ecab6b0bfcfcbde75c5e54 Mon Sep 17 00:00:00 2001 From: Sabbir Date: Fri, 25 Oct 2024 12:32:21 +0600 Subject: [PATCH] Modify cassandra AuthSecret Name Signed-off-by: Sabbir --- apis/kubedb/v1alpha2/cassandra_helpers.go | 2 +- apis/kubedb/v1alpha2/cassandra_webhook.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apis/kubedb/v1alpha2/cassandra_helpers.go b/apis/kubedb/v1alpha2/cassandra_helpers.go index e7e9b808b9..a450768b01 100644 --- a/apis/kubedb/v1alpha2/cassandra_helpers.go +++ b/apis/kubedb/v1alpha2/cassandra_helpers.go @@ -276,7 +276,7 @@ func (r *Cassandra) SetDefaults() { if r.Spec.AuthSecret == nil { r.Spec.AuthSecret = &SecretReference{ LocalObjectReference: core.LocalObjectReference{ - Name: r.DefaultUserCredSecretName(kubedb.CassandraUserAdmin), + Name: meta_util.NameWithSuffix(r.OffshootName(), "auth"), }, ExternallyManaged: false, } diff --git a/apis/kubedb/v1alpha2/cassandra_webhook.go b/apis/kubedb/v1alpha2/cassandra_webhook.go index dbd9f63d2d..a948bfa7d1 100644 --- a/apis/kubedb/v1alpha2/cassandra_webhook.go +++ b/apis/kubedb/v1alpha2/cassandra_webhook.go @@ -233,7 +233,6 @@ func (r *Cassandra) ValidateVersion(db *Cassandra) error { casVersion := catalog.CassandraVersion{} err := DefaultClient.Get(context.TODO(), types.NamespacedName{Name: db.Spec.Version}, &casVersion) if err != nil { - // fmt.Sprint(db.Spec.Version, "version not supported") return errors.New(fmt.Sprint("version ", db.Spec.Version, " not supported")) } return nil