diff --git a/pkg/operator/ceph/cluster/mgr/spec.go b/pkg/operator/ceph/cluster/mgr/spec.go index 439ccc2418670..78687b58a1812 100644 --- a/pkg/operator/ceph/cluster/mgr/spec.go +++ b/pkg/operator/ceph/cluster/mgr/spec.go @@ -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 } diff --git a/pkg/operator/ceph/cluster/mon/spec.go b/pkg/operator/ceph/cluster/mon/spec.go index 45541e2da26ea..f4ccee565d4ad 100644 --- a/pkg/operator/ceph/cluster/mon/spec.go +++ b/pkg/operator/ceph/cluster/mon/spec.go @@ -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 diff --git a/pkg/operator/ceph/cluster/osd/labels.go b/pkg/operator/ceph/cluster/osd/labels.go index 6cdde11043b5d..646aabdc33717 100644 --- a/pkg/operator/ceph/cluster/osd/labels.go +++ b/pkg/operator/ceph/cluster/osd/labels.go @@ -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 } diff --git a/pkg/operator/ceph/file/mds/spec.go b/pkg/operator/ceph/file/mds/spec.go index 56d1466608e0b..71a2e72f3071f 100644 --- a/pkg/operator/ceph/file/mds/spec.go +++ b/pkg/operator/ceph/file/mds/spec.go @@ -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 } diff --git a/pkg/operator/ceph/nfs/spec.go b/pkg/operator/ceph/nfs/spec.go index a93cab3cc639e..16cef484744db 100644 --- a/pkg/operator/ceph/nfs/spec.go +++ b/pkg/operator/ceph/nfs/spec.go @@ -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 } diff --git a/pkg/operator/ceph/object/spec.go b/pkg/operator/ceph/object/spec.go index 7fc6dd4fb4f47..90ed93bb6a45b 100644 --- a/pkg/operator/ceph/object/spec.go +++ b/pkg/operator/ceph/object/spec.go @@ -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 }