resources: for share based resources add security & config labels

Add labels for "samba-operator.samba.org/common-config-from" and
"samba-operator.samba.org/security-config-from" when the server instance
is derived from a share using common config or security config CRs. The
values of the labels map back to the names of the resources.
This can be handy for quickly seeing what resources came from where and
when writing tests that need to associate a pod with a CR resource
beyond just the SmbShare name.

Signed-off-by: John Mulligan <[email protected]>

Author: phlogistonjohn

internal/resources/deployments.go

@@ -27,14 +27,16 @@ import (
 )
 
 var (
-	serviceLabel = "samba-operator.samba.org/service"
+	serviceLabel        = "samba-operator.samba.org/service"
+	commonConfigLabel   = "samba-operator.samba.org/common-config-from"
+	securityConfigLabel = "samba-operator.samba.org/security-config-from"
 )
 
 // buildDeployment returns a samba server deployment object
 func buildDeployment(cfg *conf.OperatorConfig,
 	planner *pln.Planner, pvcName, ns string) *appsv1.Deployment {
 	// construct a deployment based on the following labels
-	labels := labelsForSmbServer(planner.InstanceName())
+	labels := labelsForSmbServer(planner)
 	var size int32 = 1
 
 	deployment := &appsv1.Deployment{
@@ -65,7 +67,18 @@ func buildDeployment(cfg *conf.OperatorConfig,
 
 // labelsForSmbServer returns the labels for selecting the resources
 // belonging to the given CR name.
-func labelsForSmbServer(name string) map[string]string {
+func labelsForSmbServer(planner *pln.Planner) map[string]string {
+	labels := labelsForManagedResource(planner.InstanceName())
+	if planner.CommonConfig != nil {
+		labels[commonConfigLabel] = labelValue(planner.CommonConfig.Name)
+	}
+	if planner.SecurityConfig != nil {
+		labels[securityConfigLabel] = labelValue(planner.SecurityConfig.Name)
+	}
+	return labels
+}
+
+func labelsForManagedResource(name string) map[string]string {
 	return map[string]string{
 		// top level labes
 		"app": "samba",

internal/resources/metrics.go

@@ -91,7 +91,7 @@ func (m *SmbShareManager) getOrCreateMetricsService(
 		return nil, false, err
 	}
 	inst := pl.SmbShare
-	labels := labelsForSmbServer(metricsInstanceName(pl))
+	labels := labelsForManagedResource(metricsInstanceName(pl))
 	srvWant := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: srvKey.Namespace,
@@ -168,7 +168,7 @@ func (m *SmbShareManager) getOrCreateMetricsServiceMonitor(
 		return nil, false, err
 	}
 	inst := pl.SmbShare
-	labels := labelsForSmbServer(metricsInstanceName(pl))
+	labels := labelsForManagedResource(metricsInstanceName(pl))
 	smWant := &monitoringv1.ServiceMonitor{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: smKey.Namespace,

internal/resources/services.go

@@ -26,7 +26,7 @@ import (
 var svcSelectorKey = "samba-operator.samba.org/service"
 
 func newServiceForSmb(planner *pln.Planner, ns string) *corev1.Service {
-	labels := labelsForSmbServer(planner.InstanceName())
+	labels := labelsForSmbServer(planner)
 	return &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      planner.InstanceName(),

internal/resources/statefulsets.go

@@ -27,7 +27,7 @@ func buildStatefulSet(
 	planner *pln.Planner,
 	dataPVCName, statePVCName, ns string) *appsv1.StatefulSet {
 	// ---
-	labels := labelsForSmbServer(planner.InstanceName())
+	labels := labelsForSmbServer(planner)
 	size := planner.ClusterSize()
 	podSpec := buildClusteredPodSpec(planner, dataPVCName, statePVCName)
 	if planner.NodeSpread() {