Moved label creation to function (#16)

isala404 · Jul 17, 2021 · fccf4bd · fccf4bd
1 parent b655784
commit fccf4bd
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 51 deletions.
diff --git a/operator/controllers/provision.go b/operator/controllers/provision.go
@@ -30,15 +30,9 @@ func (r *FlowTestReconciler) provisionResource(ctx context.Context) error {
 			Kind:       "ConfigMap",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      fmt.Sprintf("%s-configmap", flowTest.Spec.ReferencePod.Name),
+			Name:      fmt.Sprintf("%s-configmap", flowTest.ObjectMeta.UID),
 			Namespace: flowTest.Spec.ReferencePod.Namespace,
-			Labels: map[string]string{
-				"app.kubernetes.io/name":                "pod-simulation",
-				"app.kubernetes.io/managed-by":          "rancher-logging-explorer",
-				"app.kubernetes.io/created-by":          "logging-plumber",
-				"loggingplumber.isala.me/flowtest-uuid": string(flowTest.ObjectMeta.UID),
-				"loggingplumber.isala.me/flowtest":      flowTest.ObjectMeta.Name,
-			},
+			Labels:    GetLabels("pod-simulation", &flowTest),
 		},
 		Immutable:  &Immutable,
 		BinaryData: map[string][]byte{"simulation.log": logOutput.Bytes()},
@@ -51,7 +45,6 @@ func (r *FlowTestReconciler) provisionResource(ctx context.Context) error {
 
 	logger.V(1).Info("deployed config map with simulation.log", "uuid", configMap.ObjectMeta.UID)
 
-	// TODO: set the name based on flowtest uuid
 	var referencePod v1.Pod
 	if err := r.Get(ctx, types.NamespacedName{
 		Namespace: flowTest.Spec.ReferencePod.Namespace,
@@ -82,7 +75,7 @@ func (r *FlowTestReconciler) provisionResource(ctx context.Context) error {
 					Name: "config-volume",
 					VolumeSource: v1.VolumeSource{
 						ConfigMap: &v1.ConfigMapVolumeSource{
-							LocalObjectReference: v1.LocalObjectReference{Name: fmt.Sprintf("%s-configmap", flowTest.Spec.ReferencePod.Name)},
+							LocalObjectReference: v1.LocalObjectReference{Name: fmt.Sprintf("%s-configmap", flowTest.ObjectMeta.UID)},
 						},
 					},
 				},
@@ -91,13 +84,7 @@ func (r *FlowTestReconciler) provisionResource(ctx context.Context) error {
 		},
 	}
 
-	extraLabels := map[string]string{}
-
-	extraLabels["app.kubernetes.io/name"] = "pod-simulation"
-	extraLabels["app.kubernetes.io/managed-by"] = "rancher-logging-explorer"
-	extraLabels["app.kubernetes.io/created-by"] = "logging-plumber"
-	extraLabels["loggingplumber.isala.me/flowtest-uuid"] = string(flowTest.ObjectMeta.UID)
-	extraLabels["loggingplumber.isala.me/flowtest"] = flowTest.ObjectMeta.Name
+	extraLabels := GetLabels("pod-simulation", &flowTest)
 
 	simulationPod.ObjectMeta.Labels = referencePod.ObjectMeta.Labels
 
@@ -123,12 +110,8 @@ func (r *FlowTestReconciler) provisionResource(ctx context.Context) error {
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "logging-plumber-log-aggregator",
 					Namespace: flowTest.ObjectMeta.Namespace,
-					Labels: map[string]string{
-						"app.kubernetes.io/name":            "logging-plumber-log-aggregator",
-						"app.kubernetes.io/managed-by":      "rancher-logging-explorer",
-						"app.kubernetes.io/created-by":      "logging-plumber",
-						"loggingplumber.isala.me/component": "log-aggregator",
-					},
+					Labels: GetLabels("logging-plumber-log-aggregator", nil,
+						map[string]string{"loggingplumber.isala.me/component": "log-aggregator"}),
 				},
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{{

diff --git a/operator/controllers/utils.go b/operator/controllers/utils.go
@@ -22,13 +22,7 @@ func flowTemplates(flow flowv1beta1.Flow, flowTest loggingplumberv1alpha1.FlowTe
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("%s-test", flow.ObjectMeta.Name),
 			Namespace: flow.Namespace,
-			Labels: map[string]string{
-				"app.kubernetes.io/name":                flow.ObjectMeta.Name,
-				"app.kubernetes.io/managed-by":          "rancher-logging-explorer",
-				"app.kubernetes.io/created-by":          "logging-plumber",
-				"loggingplumber.isala.me/flowtest-uuid": string(flowTest.ObjectMeta.UID),
-				"loggingplumber.isala.me/flowtest":      flowTest.ObjectMeta.Name,
-			},
+			Labels:    GetLabels(flow.ObjectMeta.Name, &flowTest),
 		},
 		Spec: flowv1beta1.FlowSpec{
 			LocalOutputRefs: nil,
@@ -46,13 +40,7 @@ func flowTemplates(flow flowv1beta1.Flow, flowTest loggingplumberv1alpha1.FlowTe
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("%s-test", flow.ObjectMeta.Name),
 			Namespace: flow.Namespace,
-			Labels: map[string]string{
-				"app.kubernetes.io/name":                flow.ObjectMeta.Name,
-				"app.kubernetes.io/managed-by":          "rancher-logging-explorer",
-				"app.kubernetes.io/created-by":          "logging-plumber",
-				"loggingplumber.isala.me/flowtest-uuid": string(flowTest.ObjectMeta.UID),
-				"loggingplumber.isala.me/flowtest":      flowTest.ObjectMeta.Name,
-			},
+			Labels:    GetLabels(flow.ObjectMeta.Name, &flowTest),
 		},
 		Spec: flowv1beta1.OutputSpec{
 			HTTPOutput: &output.HTTPOutputConfig{
@@ -77,13 +65,7 @@ func clusterFlowTemplates(flow flowv1beta1.ClusterFlow, flowTest loggingplumberv
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("%s-test", flow.ObjectMeta.Name),
 			Namespace: flowTest.Spec.ReferenceFlow.Namespace,
-			Labels: map[string]string{
-				"app.kubernetes.io/name":                flow.ObjectMeta.Name,
-				"app.kubernetes.io/managed-by":          "rancher-logging-explorer",
-				"app.kubernetes.io/created-by":          "logging-plumber",
-				"loggingplumber.isala.me/flowtest-uuid": string(flowTest.ObjectMeta.UID),
-				"loggingplumber.isala.me/flowtest":      flowTest.ObjectMeta.Name,
-			},
+			Labels:    GetLabels(flow.ObjectMeta.Name, &flowTest),
 		},
 		Spec: flowv1beta1.ClusterFlowSpec{
 			GlobalOutputRefs: nil,
@@ -101,13 +83,7 @@ func clusterFlowTemplates(flow flowv1beta1.ClusterFlow, flowTest loggingplumberv
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("%s-test", flow.ObjectMeta.Name),
 			Namespace: flowTest.Spec.ReferenceFlow.Namespace,
-			Labels: map[string]string{
-				"app.kubernetes.io/name":                flow.ObjectMeta.Name,
-				"app.kubernetes.io/managed-by":          "rancher-logging-explorer",
-				"app.kubernetes.io/created-by":          "logging-plumber",
-				"loggingplumber.isala.me/flowtest-uuid": string(flowTest.ObjectMeta.UID),
-				"loggingplumber.isala.me/flowtest":      flowTest.ObjectMeta.Name,
-			},
+			Labels:    GetLabels(flow.ObjectMeta.Name, &flowTest),
 		},
 		Spec: flowv1beta1.ClusterOutputSpec{
 			OutputSpec: flowv1beta1.OutputSpec{
@@ -182,3 +158,22 @@ func CheckIndex(ctx context.Context, indexName string) (bool, error) {
 
 	return false, nil
 }
+
+func GetLabels(name string, flowTest *loggingplumberv1alpha1.FlowTest, labelsMaps ...map[string]string) map[string]string {
+	labels := map[string]string{}
+
+	for _, labelsMap := range labelsMaps {
+		for k, v := range labelsMap {
+			labels[k] = v
+		}
+	}
+
+	labels["app.kubernetes.io/name"] = name
+	if flowTest != nil {
+		labels["loggingplumber.isala.me/flowtest-uuid"] = string(flowTest.ObjectMeta.UID)
+		labels["loggingplumber.isala.me/flowtest"] = flowTest.ObjectMeta.Name
+	}
+	labels["app.kubernetes.io/created-by"] = "logging-plumber"
+	labels["app.kubernetes.io/managed-by"] = "rancher-logging-explorer"
+	return labels
+}