From f5a71a8f3fb10aabd0fe7522a52b062e70a1a82e Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Wed, 12 Apr 2017 15:56:40 -0700 Subject: [PATCH] base the secret name on the cluster name instead of namespace --- pkg/operator/cluster/cluster.go | 2 +- pkg/operator/cluster/cluster_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/operator/cluster/cluster.go b/pkg/operator/cluster/cluster.go index a44701e08..c842b0d91 100644 --- a/pkg/operator/cluster/cluster.go +++ b/pkg/operator/cluster/cluster.go @@ -132,7 +132,7 @@ func (c *Cluster) createClientAccess(clusterInfo *cephmon.ClusterInfo) error { defer conn.Shutdown() // create a user for rbd clients - name := fmt.Sprintf("%s-rbd-user", c.Namespace) + name := fmt.Sprintf("%s-rbd-user", c.Name) username := fmt.Sprintf("client.%s", name) access := []string{"osd", "allow rwx", "mon", "allow r"} diff --git a/pkg/operator/cluster/cluster_test.go b/pkg/operator/cluster/cluster_test.go index beeae2efb..432a2d17d 100644 --- a/pkg/operator/cluster/cluster_test.go +++ b/pkg/operator/cluster/cluster_test.go @@ -50,7 +50,7 @@ func TestCreateSecrets(t *testing.T) { err := c.createClientAccess(info) assert.Nil(t, err) - secretName := fmt.Sprintf("%s-rbd-user", c.Namespace) + secretName := fmt.Sprintf("%s-rbd-user", c.Name) secret, err := clientset.CoreV1().Secrets(k8sutil.DefaultNamespace).Get(secretName, metav1.GetOptions{}) assert.Nil(t, err) assert.Equal(t, secretName, secret.Name)