ceph: rename pod labels function for more clarity

Rename PodLabels function to CephDaemonAppLabels for more clarity about
what the function's purpose is.

Signed-off-by: Blaine Gardner <blaine.gardner@suse.com>
This commit is contained in:
Blaine Gardner committed 2020-07-30 11:16:30 -06:00
1 parent 6ceaef8610
commit dcf8ae2526
8 files changed
+10 -10

No files matched your search

+1 -1
View File
@@ -323,7 +323,7 @@ func (c *Cluster) makeDashboardService(name string) *v1.Service {
}
func (c *Cluster) getPodLabels(daemonName string) map[string]string {
labels := controller.PodLabels(AppName, c.clusterInfo.Namespace, "mgr", daemonName)
labels := controller.CephDaemonAppLabels(AppName, c.clusterInfo.Namespace, "mgr", daemonName)
// leave "instance" key for legacy usage
labels["instance"] = daemonName
return labels
+1 -1
View File
@@ -46,7 +46,7 @@ const (
func (c *Cluster) getLabels(daemonName string, canary bool, pvcName string) map[string]string {
// Mons have a service for each mon, so the additional pod data is relevant for its services
// Use pod labels to keep "mon: id" for legacy
labels := controller.PodLabels(AppName, c.Namespace, "mon", daemonName)
labels := controller.CephDaemonAppLabels(AppName, c.Namespace, "mon", daemonName)
// Add "mon_cluster: <namespace>" for legacy
labels[monClusterAttr] = c.Namespace
if canary {
+1 -1
View File
@@ -44,7 +44,7 @@ func makeStorageClassDeviceSetPVCLabel(storageClassDeviceSetName, pvcStorageClas
func (c *Cluster) getOSDLabels(osdID int, failureDomainValue string, portable bool) map[string]string {
stringID := fmt.Sprintf("%d", osdID)
labels := controller.PodLabels(AppName, c.clusterInfo.Namespace, "osd", stringID)
labels := controller.CephDaemonAppLabels(AppName, c.clusterInfo.Namespace, "osd", stringID)
// Add "ceph-osd-id: <id>" for legacy
labels[OsdIdLabelKey] = stringID
labels[FailureDomainKey] = failureDomainValue
+2 -2
View File
@@ -31,7 +31,7 @@ func (r *ReconcileCephRBDMirror) makeDeployment(daemonConfig *daemonConfig, rbdM
podSpec := v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Name: daemonConfig.ResourceName,
Labels: controller.PodLabels(AppName, rbdMirror.Namespace, config.RbdMirrorType, daemonConfig.DaemonID),
Labels: controller.CephDaemonAppLabels(AppName, rbdMirror.Namespace, config.RbdMirrorType, daemonConfig.DaemonID),
},
Spec: v1.PodSpec{
InitContainers: []v1.Container{
@@ -64,7 +64,7 @@ func (r *ReconcileCephRBDMirror) makeDeployment(daemonConfig *daemonConfig, rbdM
Name: daemonConfig.ResourceName,
Namespace: rbdMirror.Namespace,
Annotations: rbdMirror.Spec.Annotations,
Labels: controller.PodLabels(AppName, rbdMirror.Namespace, config.RbdMirrorType, daemonConfig.DaemonID),
Labels: controller.CephDaemonAppLabels(AppName, rbdMirror.Namespace, config.RbdMirrorType, daemonConfig.DaemonID),
},
Spec: apps.DeploymentSpec{
Selector: &metav1.LabelSelector{
+2 -2
View File
@@ -306,11 +306,11 @@ func AppLabels(appName, namespace string) map[string]string {
}
}
// PodLabels returns pod labels common to all Rook-Ceph pods which may be useful for admins.
// CephDaemonAppLabels returns pod labels common to all Rook-Ceph pods which may be useful for admins.
// App name is the name of the application: e.g., 'rook-ceph-mon', 'rook-ceph-mgr', etc.
// Daemon type is the Ceph daemon type: "mon", "mgr", "osd", "mds", "rgw"
// Daemon ID is the ID portion of the Ceph daemon name: "a" for "mon.a"; "c" for "mds.c"
func PodLabels(appName, namespace, daemonType, daemonID string) map[string]string {
func CephDaemonAppLabels(appName, namespace, daemonType, daemonID string) map[string]string {
labels := AppLabels(appName, namespace)
labels["ceph_daemon_type"] = daemonType
labels["ceph_daemon_id"] = daemonID
+1 -1
View File
@@ -133,7 +133,7 @@ func (c *Cluster) makeMdsDaemonContainer(mdsConfig *mdsConfig) v1.Container {
}
func (c *Cluster) podLabels(mdsConfig *mdsConfig) map[string]string {
labels := controller.PodLabels(AppName, c.fs.Namespace, "mds", mdsConfig.DaemonID)
labels := controller.CephDaemonAppLabels(AppName, c.fs.Namespace, "mds", mdsConfig.DaemonID)
labels["rook_file_system"] = c.fs.Name
return labels
}
+1 -1
View File
@@ -240,7 +240,7 @@ func (r *ReconcileCephNFS) dbusContainer(nfs *cephv1.CephNFS) v1.Container {
}
func getLabels(n *cephv1.CephNFS, name string) map[string]string {
labels := controller.PodLabels(AppName, n.Namespace, "nfs", name)
labels := controller.CephDaemonAppLabels(AppName, n.Namespace, "nfs", name)
labels["ceph_nfs"] = n.Name
labels["instance"] = name
return labels
+1 -1
View File
@@ -349,7 +349,7 @@ func addPortToEndpoint(endpoints *v1.Endpoints, name string, port int32) {
}
func getLabels(name, namespace string) map[string]string {
labels := controller.PodLabels(AppName, namespace, "rgw", name)
labels := controller.CephDaemonAppLabels(AppName, namespace, "rgw", name)
labels["rook_object_store"] = name
return labels
}