Fix tests

netobserv · Dec 12, 2023 · 7c0144a · 7c0144a
1 parent 4e8a267
commit 7c0144a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/controllers/ebpf/agent_controller.go b/controllers/ebpf/agent_controller.go
@@ -99,7 +99,7 @@ func (c *AgentController) Reconcile(ctx context.Context, target *flowslatest.Flo
 	ctx = log.IntoContext(ctx, rlog)
 	current, err := c.current(ctx)
 	if err != nil {
-		return fmt.Errorf("fetching current EBPF Agent: %w", err)
+		return fmt.Errorf("fetching current eBPF agent: %w", err)
 	}
 	if !helper.UseEBPF(&target.Spec) || c.PreviousPrivilegedNamespace() != c.PrivilegedNamespace() {
 		if current == nil {

diff --git a/controllers/flowcollector_controller_certificates_test.go b/controllers/flowcollector_controller_certificates_test.go
@@ -145,7 +145,7 @@ func flowCollectorCertificatesSpecs() {
 			Namespace:       operatorNamespace,
 			DeploymentModel: flowslatest.DeploymentModelKafka,
 			Agent: flowslatest.FlowCollectorAgent{
-				Type: "EBPF",
+				Type: "eBPF",
 			},
 			Loki: flowslatest.FlowCollectorLoki{
 				Enable: ptr.To(true),
@@ -186,7 +186,7 @@ func flowCollectorCertificatesSpecs() {
 						},
 					},
 					SASL: flowslatest.SASLConfig{
-						Type: "PLAIN",
+						Type: "Plain",
 						ClientIDReference: flowslatest.FileReference{
 							Type: flowslatest.RefTypeSecret,
 							Name: kafka2Sasl.Name,

diff --git a/controllers/flowcollector_controller_ebpf_test.go b/controllers/flowcollector_controller_ebpf_test.go
@@ -61,7 +61,7 @@ func flowCollectorEBPFSpecs() {
 						LogLevel:        "error",
 					},
 					Agent: flowslatest.FlowCollectorAgent{
-						Type: "EBPF",
+						Type: "eBPF",
 						EBPF: flowslatest.FlowCollectorEBPF{
 							Sampling:           ptr.To(int32(123)),
 							CacheActiveTimeout: "15s",
@@ -281,7 +281,7 @@ func flowCollectorEBPFKafkaSpecs() {
 				ObjectMeta: metav1.ObjectMeta{Name: crKey.Name},
 				Spec: flowslatest.FlowCollectorSpec{
 					Namespace:       operatorNamespace,
-					Agent:           flowslatest.FlowCollectorAgent{Type: "EBPF"},
+					Agent:           flowslatest.FlowCollectorAgent{Type: "eBPF"},
 					DeploymentModel: flowslatest.DeploymentModelKafka,
 					Kafka: flowslatest.FlowCollectorKafka{
 						Address: "kafka-cluster-kafka-bootstrap",

diff --git a/controllers/flowcollector_controller_iso_test.go b/controllers/flowcollector_controller_iso_test.go
@@ -65,7 +65,7 @@ func flowCollectorIsoSpecs() {
 				LogLevel:                       "trace",
 				Resources:                      v1.ResourceRequirements{Limits: nil, Requests: nil},
 				KafkaConsumerReplicas:          &zero,
-				KafkaConsumerAutoscaler:        flowslatest.FlowCollectorHPA{Status: "DISABLED", MinReplicas: &zero, MaxReplicas: zero, Metrics: []ascv2.MetricSpec{}},
+				KafkaConsumerAutoscaler:        flowslatest.FlowCollectorHPA{Status: "Disabled", MinReplicas: &zero, MaxReplicas: zero, Metrics: []ascv2.MetricSpec{}},
 				KafkaConsumerQueueCapacity:     int(zero),
 				KafkaConsumerBatchSize:         int(zero),
 				ConversationHeartbeatInterval:  &metav1.Duration{Duration: time.Second},
@@ -79,7 +79,7 @@ func flowCollectorIsoSpecs() {
 					Server: flowslatest.MetricsServerConfig{
 						Port: 12347,
 						TLS: flowslatest.ServerTLS{
-							Type:     "DISABLED",
+							Type:     "Disabled",
 							Provided: nil,
 						},
 					},
@@ -89,7 +89,7 @@ func flowCollectorIsoSpecs() {
 				DropUnusedFields: ptr.To(false),
 			},
 			Agent: flowslatest.FlowCollectorAgent{
-				Type: "EBPF",
+				Type: "eBPF",
 				IPFIX: flowslatest.FlowCollectorIPFIX{
 					Sampling:           2, // 0 is forbidden here
 					CacheActiveTimeout: "5s",
@@ -127,7 +127,7 @@ func flowCollectorIsoSpecs() {
 				ImagePullPolicy: "Always",
 				Resources:       v1.ResourceRequirements{Limits: nil, Requests: nil},
 				LogLevel:        "trace",
-				Autoscaler:      flowslatest.FlowCollectorHPA{Status: "DISABLED", MinReplicas: &zero, MaxReplicas: zero, Metrics: []ascv2.MetricSpec{}},
+				Autoscaler:      flowslatest.FlowCollectorHPA{Status: "Disabled", MinReplicas: &zero, MaxReplicas: zero, Metrics: []ascv2.MetricSpec{}},
 				PortNaming: flowslatest.ConsolePluginPortConfig{
 					Enable:    ptr.To(false),
 					PortNames: map[string]string{},
@@ -142,7 +142,7 @@ func flowCollectorIsoSpecs() {
 					QuerierURL:  "http://loki",
 					StatusURL:   "",
 					TenantID:    "test",
-					AuthToken:   "DISABLED",
+					AuthToken:   "Disabled",
 					TLS:         defaultTLS,
 					StatusTLS:   defaultTLS,
 				},
@@ -174,7 +174,7 @@ func flowCollectorIsoSpecs() {
 				Topic:   "topic",
 				TLS:     defaultTLS,
 				SASL: flowslatest.SASLConfig{
-					Type: "DISABLED",
+					Type: "Disabled",
 					ClientIDReference: flowslatest.FileReference{
 						Type:      "configmap",
 						Name:      "",