singleEndpointConfig: use omitempty

Signed-off-by: Benedikt Bongartz <[email protected]>

apis/v1beta1/config.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"net"
 	"reflect"
-	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -262,7 +261,6 @@ func (c *Config) applyDefaultForComponentKinds(logger logr.Logger, componentKind
 				// field. It is marshaled due to internal use. To avoid adding invalid fields to the
 				// collector config, this temporary workaround removes this field.
 				// TODO: Try to get rid of it or move it into the parser.GetDefaultConfig method.
-				removeKeysRecursively(out, "listenaddress")
 				cfg.Object[componentName] = out
 			}
 		}
@@ -271,27 +269,6 @@ func (c *Config) applyDefaultForComponentKinds(logger logr.Logger, componentKind
 	return nil
 }
 
-func removeKeysRecursively(m map[string]interface{}, keysToRemove ...string) {
-	for k, v := range m {
-		if slices.Contains(keysToRemove, k) {
-			delete(m, k)
-			continue
-		}
-
-		if nm, ok := v.(map[string]interface{}); ok {
-			removeKeysRecursively(nm, keysToRemove...)
-		}
-
-		if ns, ok := v.([]interface{}); ok {
-			for _, item := range ns {
-				if nestedMap, ok := item.(map[string]interface{}); ok {
-					removeKeysRecursively(nestedMap, keysToRemove...)
-				}
-			}
-		}
-	}
-}
-
 func (c *Config) GetReceiverPorts(logger logr.Logger) ([]corev1.ServicePort, error) {
 	return c.getPortsForComponentKinds(logger, KindReceiver)
 }

internal/components/generic_parser.go

@@ -52,7 +52,7 @@ func (g *GenericParser[T]) GetDefaultConfig(logger logr.Logger, config interface
 	if err := mapstructure.Decode(config, &parsed); err != nil {
 		return nil, err
 	}
-	return g.defaultsApplier(logger, g.settings.defaultRecAddr, g.settings.port, parsed)
+	return g.defaultsApplier(logger, g.settings.defaultRecAddr, g.settings.GetServicePort().Port, parsed)
 }
 
 func (g *GenericParser[T]) GetLivenessProbe(logger logr.Logger, config interface{}) (*corev1.Probe, error) {

internal/components/single_endpoint.go

@@ -31,8 +31,8 @@ var (
 // SingleEndpointConfig represents the minimal struct for a given YAML configuration input containing either
 // endpoint or listen_address.
 type SingleEndpointConfig struct {
-	Endpoint      string `mapstructure:"endpoint,omitempty"`
-	ListenAddress string `mapstructure:"listen_address,omitempty"`
+	Endpoint      string `mapstructure:"endpoint,omitempty" yaml:"endpoint,omitempty"`
+	ListenAddress string `mapstructure:"listen_address,omitempty" yaml:"listen_address,omitempty"`
 }
 
 func (g *SingleEndpointConfig) GetPortNumOrDefault(logger logr.Logger, p int32) int32 {