Use cluster.Status.Binding instead of cluster.Status.DefaultUser

rabbitmq · Apr 7, 2021 · 5a216ca · 5a216ca
1 parent 7f046c8
commit 5a216ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/internal/rabbitmq_client_factory.go b/internal/rabbitmq_client_factory.go
@@ -120,8 +120,7 @@ func serviceSecretFromReference(ctx context.Context, c client.Client, rmq topolo
 	}
 
 	secret := &corev1.Secret{}
-	// TODO: use cluster.Status.Binding instead of cluster.Status.DefaultUser.SecretReference.Name after the PR exposes Status.Binding is released
-	if err := c.Get(ctx, types.NamespacedName{Namespace: namespace, Name: cluster.Status.DefaultUser.SecretReference.Name}, secret); err != nil {
+	if err := c.Get(ctx, types.NamespacedName{Namespace: namespace, Name: cluster.Status.Binding.Name}, secret); err != nil {
 		return nil, nil, err
 	}
 

diff --git a/internal/rabbitmq_client_factory_test.go b/internal/rabbitmq_client_factory_test.go
@@ -51,11 +51,10 @@ var _ = Describe("RabbitholeClientFactory", func() {
 				Namespace: "rabbitmq-system",
 			},
 			Status: rabbitmqv1beta1.RabbitmqClusterStatus{
+				Binding: &corev1.LocalObjectReference{
+					Name: "rmq-default-user-credentials",
+				},
 				DefaultUser: &rabbitmqv1beta1.RabbitmqClusterDefaultUser{
-					SecretReference: &rabbitmqv1beta1.RabbitmqClusterSecretReference{
-						Name:      "rmq-default-user-credentials",
-						Namespace: "rabbitmq-system",
-					},
 					ServiceReference: &rabbitmqv1beta1.RabbitmqClusterServiceReference{
 						Name:      "rmq-service",
 						Namespace: "rabbitmq-system",
@@ -96,7 +95,7 @@ var _ = Describe("RabbitholeClientFactory", func() {
 	AfterEach(func() {
 		fakeRabbitMQServer.Close()
 	})
-	It("generates a rabbithole client which makes sucessful requests to the RabbitMQ Server", func() {
+	It("generates a rabbithole client which makes successful requests to the RabbitMQ Server", func() {
 		generatedClient, err := internal.RabbitholeClientFactory(ctx, fakeClient, topology.RabbitmqClusterReference{Name: existingRabbitMQCluster.Name}, existingRabbitMQCluster.Namespace)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(generatedClient).NotTo(BeNil())