Add Deployment "selector" facet

Author: obs-gh-enricogiorio

components/processors/observek8sattributesprocessor/daemonsetactions.go

@@ -6,19 +6,19 @@ import (
 )
 
 const (
-	DaemonsetSelectorAttributeKey = "selector"
+	DaemonSetSelectorAttributeKey = "selector"
 )
 
 type DaemonSetSelectorAction struct{}
 
-func NewDaemonsetSelectorAction() DaemonSetSelectorAction {
+func NewDaemonSetSelectorAction() DaemonSetSelectorAction {
 	return DaemonSetSelectorAction{}
 }
 
 // ---------------------------------- DaemonSet "selector" ----------------------------------
 
-// Generates the Daemonset "selector" facet.
+// Generates the DaemonSet "selector" facet.
 func (DaemonSetSelectorAction) ComputeAttributes(daemonset appsv1.DaemonSet) (attributes, error) {
-	selectorString := metav1.FormatLabelSelector(daemonset.Spec.Selector)
-	return attributes{DaemonsetSelectorAttributeKey: selectorString}, nil
+	selecotString := metav1.FormatLabelSelector(daemonset.Spec.Selector)
+	return attributes{DaemonSetSelectorAttributeKey: selecotString}, nil
 }

components/processors/observek8sattributesprocessor/deploymentactions.go

@@ -0,0 +1,24 @@
+package observek8sattributesprocessor
+
+import (
+	appsv1 "k8s.io/api/apps/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const (
+	DeploymentSelectorAttributeKey = "selector"
+)
+
+type DeploymentSelectorAction struct{}
+
+func NewDeploymentSelectorAction() DeploymentSelectorAction {
+	return DeploymentSelectorAction{}
+}
+
+// ---------------------------------- Deployment "selector" ----------------------------------
+
+// Generates the Deployment "selector" facet.
+func (DeploymentSelectorAction) ComputeAttributes(deployment appsv1.Deployment) (attributes, error) {
+	selecotString := metav1.FormatLabelSelector(deployment.Spec.Selector)
+	return attributes{DeploymentSelectorAttributeKey: selecotString}, nil
+}

components/processors/observek8sattributesprocessor/deploymentactions_test.go

@@ -0,0 +1,17 @@
+package observek8sattributesprocessor
+
+import "testing"
+
+func TestDeploymentActions(t *testing.T) {
+	for _, testCase := range []k8sEventProcessorTest{
+		{
+			name:   "Pretty print of a DaemonSet's selector",
+			inLogs: resourceLogsFromSingleJsonEvent("./testdata/deploymentEvent.json"),
+			expectedResults: []queryWithResult{
+				{"observe_transform.facets.selector", "app.kubernetes.io/instance=observe-agent,app.kubernetes.io/name=deployment-cluster-events,component=standalone-collector"},
+			},
+		},
+	} {
+		runTest(t, testCase)
+	}
+}

components/processors/observek8sattributesprocessor/processor.go

@@ -27,6 +27,7 @@ const (
 	// APPS
 	EventKindStatefulSet = "StatefulSet"
 	EventKindDaemonSet   = "DaemonSet"
+	EventKindDeployment  = "Deployment"
 	// WORKLOAD
 	EventKindJob     = "Job"
 	EventKindCronJob = "CronJob"
@@ -53,6 +54,7 @@ type K8sEventsProcessor struct {
 
 	daemonSetActions   []daemonSetAction
 	statefulSetActions []statefulSetAction
+	deploymentActions  []deploymentAction
 
 	persistentVolumeActions      []persistentVolumeAction
 	persistentVolumeClaimActions []persistentVolumeClaimAction
@@ -90,11 +92,14 @@ func newK8sEventsProcessor(logger *zap.Logger, cfg component.Config) *K8sEventsP
 			NewCronJobActiveAction(),
 		},
 
+		deploymentActions: []deploymentAction{
+			NewDeploymentSelectorAction(),
+		},
 		statefulSetActions: []statefulSetAction{
 			NewStatefulsetSelectorAction(),
 		},
 		daemonSetActions: []daemonSetAction{
-			NewDaemonsetSelectorAction(),
+			NewDaemonSetSelectorAction(),
 		},
 
 		persistentVolumeActions: []persistentVolumeAction{
@@ -179,6 +184,14 @@ func (kep *K8sEventsProcessor) unmarshalEvent(lr plog.LogRecord) metav1.Object {
 			return nil
 		}
 		return &configMap
+	case EventKindDeployment:
+		var deployment appsv1.Deployment
+		err := json.Unmarshal([]byte(lr.Body().AsString()), &deployment)
+		if err != nil {
+			kep.logger.Error("failed to unmarshal Deployment event %v", zap.Error(err), zap.String("event", lr.Body().AsString()))
+			return nil
+		}
+		return &deployment
 	case EventKindStatefulSet:
 		var statefulSet appsv1.StatefulSet
 		err := json.Unmarshal([]byte(lr.Body().AsString()), &statefulSet)

components/processors/observek8sattributesprocessor/serviceactions.go

@@ -76,7 +76,7 @@ func NewServiceSelectorAction() ServiceSelectorAction {
 // Generates the Service "selector" facet.
 func (ServiceSelectorAction) ComputeAttributes(service corev1.Service) (attributes, error) {
 	selectorString := FormatLabels(service.Spec.Selector)
-	return attributes{DaemonsetSelectorAttributeKey: selectorString}, nil
+	return attributes{DaemonSetSelectorAttributeKey: selectorString}, nil
 
 }