ceph: fixing ClientID of log-collector for RGW instance

The Client_ID generated by operator was
different from the log rotate file created
The Clinet_ID= rgwceph.client.rook.ceph.rgw.my.store.a
and log file name= ceph-client.rgw.my.store.a.log
So changed the CLient_ID to ceph-client.rgw.my.store.a for
correct working and this follow the patterns how other modules
Client_ID is generated

Closes: #8692
Signed-off-by: parth-gr <paarora@redhat.com>

pkg/operator/ceph/object/spec.go

@@ -111,7 +111,7 @@ func (c *clusterConfig) makeRGWPodSpec(rgwConfig *rgwConfig) (v1.PodTemplateSpec
 	if c.clusterSpec.LogCollector.Enabled {
 		shareProcessNamespace := true
 		podSpec.ShareProcessNamespace = &shareProcessNamespace
-		podSpec.Containers = append(podSpec.Containers, *controller.LogCollectorContainer(strings.TrimPrefix(generateCephXUser(fmt.Sprintf("ceph-client.%s", rgwConfig.ResourceName)), "client."), c.clusterInfo.Namespace, *c.clusterSpec))
+		podSpec.Containers = append(podSpec.Containers, *controller.LogCollectorContainer(getDaemonName(rgwConfig), c.clusterInfo.Namespace, *c.clusterSpec))
 	}
 
 	// Replace default unreachable node toleration
@@ -611,3 +611,7 @@ func (c *clusterConfig) rgwTLSSecretType(secretName string) (v1.SecretType, erro
 	}
 	return "", errors.Wrapf(err, "no Kubernetes secrets referring TLS certificates found")
 }
+
+func getDaemonName(rgwConfig *rgwConfig) string {
+	return fmt.Sprintf("ceph-%s", generateCephXUser(rgwConfig.ResourceName))
+}

pkg/operator/ceph/object/spec_test.go

@@ -379,3 +379,30 @@ func TestCheckRGWKMS(t *testing.T) {
 	assert.True(t, b)
 	assert.NoError(t, err)
 }
+
+func TestGetDaemonName(t *testing.T) {
+	context := &clusterd.Context{Clientset: test.New(t, 3)}
+	store := simpleStore()
+	c := &clusterConfig{
+		context: context,
+		store:   store,
+	}
+	daemonName := fmt.Sprintf("%s-%s", c.store.Name, "a")
+	resourceName := fmt.Sprintf("%s-%s", AppName, daemonName)
+	rgwconfig := &rgwConfig{
+		ResourceName: resourceName,
+		DaemonID:     daemonName,
+	}
+	daemon := getDaemonName(rgwconfig)
+	assert.Equal(t, "ceph-client.rgw.default.a", daemon)
+
+	c.store.Name = "my-store" // updating store name
+	daemonName = fmt.Sprintf("%s-%s", c.store.Name, "b")
+	resourceName = fmt.Sprintf("%s-%s", AppName, daemonName)
+	rgwconfig = &rgwConfig{
+		ResourceName: resourceName,
+		DaemonID:     daemonName,
+	}
+	daemon = getDaemonName(rgwconfig)
+	assert.Equal(t, "ceph-client.rgw.my.store.b", daemon)
+}