Skip to content

Commit

Permalink
ceph: fixing ClientID of log-collector for RGW instance
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
parth-gr committed Sep 30, 2021
1 parent 8637b07 commit 9909c43
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/operator/ceph/object/spec.go
Expand Up @@ -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(fmt.Sprintf("ceph-%s", generateCephXUser(rgwConfig.ResourceName)), c.clusterInfo.Namespace, *c.clusterSpec))
}

// Replace default unreachable node toleration
Expand Down

0 comments on commit 9909c43

Please sign in to comment.