Merge pull request #568 from travisn/rbd-user-name

base the secret name on the cluster name instead of namespace
This commit is contained in:
Travis Nielsen authored and GitHub committed 2017-04-12 16:23:33 -07:00
commit d29e091554
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -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"}
+1 -1
View File
@@ -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)