Skip to content

Commit

Permalink
ceph: create rook resources with k8s recommended labels
Browse files Browse the repository at this point in the history
Adding Recommended Labels on the resources created by
Rook Operator
For better visuals and management of k8s object

Closes: rook#8400
Signed-off-by: parth-gr <paarora@redhat.com>
  • Loading branch information
parth-gr committed Oct 8, 2021
1 parent 4ad6b06 commit 2ccd074
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 1 deletion.
9 changes: 8 additions & 1 deletion pkg/operator/ceph/cluster/mgr/spec.go
Expand Up @@ -321,7 +321,14 @@ func (c *Cluster) makeDashboardService(name, activeDaemon string) (*v1.Service,
func (c *Cluster) getPodLabels(daemonName string, includeNewLabels bool) map[string]string {
labels := controller.CephDaemonAppLabels(AppName, c.clusterInfo.Namespace, "mgr", daemonName, includeNewLabels)
// leave "instance" key for legacy usage
labels["instance"] = daemonName
// if includeNewLabels {
// labels["app.kubernetes.io/name"] = AppName
// labels["app.kubernetes.io/instance"] = c.clusterInfo.Namespace + "_mgr-" + daemonName
// labels["app.kubernetes.io/component"] = "ceph-mgr"
// labels["app.kubernetes.io/part-of"] = "cephclusters.ceph.rook.io_" + c.clusterInfo.Namespace
// labels["app.kubernetes.io/managed-by"] = "rook-ceph-operator"
// labels["app.kubernetes.io/created-by"] = "rook-ceph-operator"
// }
return labels
}

Expand Down
6 changes: 6 additions & 0 deletions pkg/operator/ceph/cluster/mon/spec.go
Expand Up @@ -59,6 +59,12 @@ func (c *Cluster) getLabels(monConfig *monConfig, canary, includeNewLabels bool)
if monConfig.Zone != "" {
labels["stretch-zone"] = monConfig.Zone
}
labels["app.kubernetes.io/name"] = AppName
labels["app.kubernetes.io/instance"] = c.Namespace + "_mon-" + monConfig.DaemonName
labels["app.kubernetes.io/component"] = "ceph-mon"
labels["app.kubernetes.io/part-of"] = "cephclusters.ceph.rook.io_" + c.Namespace
labels["app.kubernetes.io/managed-by"] = "rook-ceph-operator"
labels["app.kubernetes.io/created-by"] = "rook-ceph-operator"
}

return labels
Expand Down
6 changes: 6 additions & 0 deletions pkg/operator/ceph/cluster/osd/labels.go
Expand Up @@ -51,6 +51,12 @@ func (c *Cluster) getOSDLabels(osd OSDInfo, failureDomainValue string, portable
labels[OsdIdLabelKey] = stringID
labels[FailureDomainKey] = failureDomainValue
labels[portableKey] = strconv.FormatBool(portable)
labels["app.kubernetes.io/name"] = AppName
labels["app.kubernetes.io/instance"] = c.clusterInfo.Namespace + "_osd-" + stringID
labels["app.kubernetes.io/component"] = "ceph-osd"
labels["app.kubernetes.io/part-of"] = "cephclusters.ceph.rook.io_" + c.clusterInfo.Namespace
labels["app.kubernetes.io/managed-by"] = "rook-ceph-operator"
labels["app.kubernetes.io/created-by"] = "rook-ceph-operator"
for k, v := range getOSDTopologyLocationLabels(osd.Location) {
labels[k] = v
}
Expand Down
8 changes: 8 additions & 0 deletions pkg/operator/ceph/file/mds/spec.go
Expand Up @@ -157,6 +157,14 @@ func (c *Cluster) makeMdsDaemonContainer(mdsConfig *mdsConfig) v1.Container {
func (c *Cluster) podLabels(mdsConfig *mdsConfig, includeNewLabels bool) map[string]string {
labels := controller.CephDaemonAppLabels(AppName, c.fs.Namespace, "mds", mdsConfig.DaemonID, includeNewLabels)
labels["rook_file_system"] = c.fs.Name
if includeNewLabels {
labels["app.kubernetes.io/name"] = AppName
labels["app.kubernetes.io/instance"] = c.clusterInfo.Namespace + "_mds-" + mdsConfig.DaemonID
labels["app.kubernetes.io/component"] = "ceph-mds"
labels["app.kubernetes.io/part-of"] = "cephfilesystems.ceph.rook.io_" + c.clusterInfo.Namespace
labels["app.kubernetes.io/managed-by"] = "rook-ceph-operator"
labels["app.kubernetes.io/created-by"] = "rook-ceph-operator"
}
return labels
}

Expand Down
8 changes: 8 additions & 0 deletions pkg/operator/ceph/nfs/spec.go
Expand Up @@ -245,6 +245,14 @@ func getLabels(n *cephv1.CephNFS, name string, includeNewLabels bool) map[string
labels := controller.CephDaemonAppLabels(AppName, n.Namespace, "nfs", name, includeNewLabels)
labels["ceph_nfs"] = n.Name
labels["instance"] = name
if includeNewLabels {
labels["app.kubernetes.io/name"] = AppName
labels["app.kubernetes.io/instance"] = n.Namespace + "_nfs-" + name
labels["app.kubernetes.io/component"] = "ceph-nfs"
labels["app.kubernetes.io/part-of"] = "cephnfses.ceph.rook.io_" + n.Namespace
labels["app.kubernetes.io/managed-by"] = "rook-ceph-operator"
labels["app.kubernetes.io/created-by"] = "rook-ceph-operator"
}
return labels
}

Expand Down
8 changes: 8 additions & 0 deletions pkg/operator/ceph/object/spec.go
Expand Up @@ -541,6 +541,14 @@ func addPortToEndpoint(endpoints *v1.Endpoints, name string, port int32) {
func getLabels(name, namespace string, includeNewLabels bool) map[string]string {
labels := controller.CephDaemonAppLabels(AppName, namespace, "rgw", name, includeNewLabels)
labels["rook_object_store"] = name
if includeNewLabels {
labels["app.kubernetes.io/name"] = AppName
labels["app.kubernetes.io/instance"] = namespace + "_rgw-" + name
labels["app.kubernetes.io/component"] = "ceph-rgw"
labels["app.kubernetes.io/part-of"] = "cephobjectstores.ceph.rook.io_" + namespace + "_" + name
labels["app.kubernetes.io/managed-by"] = "rook-ceph-operator"
labels["app.kubernetes.io/created-by"] = "rook-ceph-operator"
}
return labels
}

Expand Down

0 comments on commit 2ccd074

Please sign in to comment.