From bc96e19f1c41c4f44050e576fe499bb36df52b7e Mon Sep 17 00:00:00 2001 From: Michael Weibel Date: Thu, 10 Nov 2022 10:09:04 +0100 Subject: [PATCH] adjust redis connection details --- operator/rediscontroller/controller_test.go | 8 ++++---- operator/rediscontroller/observe.go | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/operator/rediscontroller/controller_test.go b/operator/rediscontroller/controller_test.go index a5267232..d1f6e4b0 100644 --- a/operator/rediscontroller/controller_test.go +++ b/operator/rediscontroller/controller_test.go @@ -86,10 +86,10 @@ func (ts *RedisControllerTestSuite) TestCreate() { ts.FetchResource(types.NamespacedName{Name: mg.Spec.WriteConnectionSecretToReference.Name, Namespace: mg.Spec.WriteConnectionSecretToReference.Namespace}, secret) ts.Assert().Equal("https://foo:bar@baz:5321", string(secret.Data["REDIS_URL"])) - ts.Assert().Equal("foo", string(secret.Data["username"])) - ts.Assert().Equal("bar", string(secret.Data["password"])) - ts.Assert().Equal("baz", string(secret.Data["host"])) - ts.Assert().Equal("5321", string(secret.Data["port"])) + ts.Assert().Equal("foo", string(secret.Data["REDIS_USERNAME"])) + ts.Assert().Equal("bar", string(secret.Data["REDIS_PASSWORD"])) + ts.Assert().Equal("baz", string(secret.Data["REDIS_HOST"])) + ts.Assert().Equal("5321", string(secret.Data["REDIS_PORT"])) ts.Assert().Equal("certifyingliketheresnotomorrow", string(secret.Data["ca.crt"])) instance := &exoscalev1.Redis{} diff --git a/operator/rediscontroller/observe.go b/operator/rediscontroller/observe.go index 84f65de6..06db6505 100644 --- a/operator/rediscontroller/observe.go +++ b/operator/rediscontroller/observe.go @@ -116,12 +116,12 @@ func connectionDetails(in oapi.DbaasServiceRedis, ca string) (map[string][]byte, } password, _ := parsed.User.Password() return map[string][]byte{ - "host": []byte(parsed.Hostname()), - "port": []byte(parsed.Port()), - "username": []byte(parsed.User.Username()), - "password": []byte(password), - "ca.crt": []byte(ca), - "REDIS_URL": []byte(uri), + "REDIS_HOST": []byte(parsed.Hostname()), + "REDIS_PORT": []byte(parsed.Port()), + "REDIS_USERNAME": []byte(parsed.User.Username()), + "REDIS_PASSWORD": []byte(password), + "REDIS_URL": []byte(uri), + "ca.crt": []byte(ca), }, nil }