fix tests

Author: jaronoff97

apis/v1beta1/config.go

@@ -168,6 +168,8 @@ func (c *Config) getRbacRulesForComponentKinds(logger logr.Logger, componentKind
 			} else {
 				cfg = *c.Processors
 			}
+		case KindExtension:
+			continue
 		}
 		for componentName := range enabledComponents[componentKind] {
 			// TODO: Clean up the naming here and make it simpler to use a retriever.
@@ -197,7 +199,9 @@ func (c *Config) getPortsForComponentKinds(logger logr.Logger, componentKinds ..
 			retriever = exporters.ParserFor
 			cfg = c.Exporters
 		case KindProcessor:
-			break
+			continue
+		case KindExtension:
+			continue
 		}
 		for componentName := range enabledComponents[componentKind] {
 			// TODO: Clean up the naming here and make it simpler to use a retriever.

apis/v1beta1/config_test.go

@@ -304,6 +304,7 @@ func TestConfig_GetEnabledComponents(t *testing.T) {
 					"bar":   struct{}{},
 					"count": struct{}{},
 				},
+				KindExtension: {},
 			},
 		},
 		{
@@ -321,6 +322,7 @@ func TestConfig_GetEnabledComponents(t *testing.T) {
 				KindExporter: {
 					"prometheus": struct{}{},
 				},
+				KindExtension: {},
 			},
 		},
 		{
@@ -339,6 +341,11 @@ func TestConfig_GetEnabledComponents(t *testing.T) {
 					"otlp":       struct{}{},
 					"prometheus": struct{}{},
 				},
+				KindExtension: {
+					"health_check": struct{}{},
+					"pprof":        struct{}{},
+					"zpages":       struct{}{},
+				},
 			},
 		},
 		{
@@ -352,6 +359,9 @@ func TestConfig_GetEnabledComponents(t *testing.T) {
 				KindExporter: {
 					"otlp/auth": struct{}{},
 				},
+				KindExtension: {
+					"oauth2client": struct{}{},
+				},
 			},
 		},
 		{
@@ -365,6 +375,7 @@ func TestConfig_GetEnabledComponents(t *testing.T) {
 				KindExporter: {
 					"debug": struct{}{},
 				},
+				KindExtension: {},
 			},
 		},
 		{
@@ -374,6 +385,7 @@ func TestConfig_GetEnabledComponents(t *testing.T) {
 				KindReceiver:  {},
 				KindProcessor: {},
 				KindExporter:  {},
+				KindExtension: {},
 			},
 		},
 	}

internal/components/extensions/healthcheckv1.go

@@ -22,7 +22,10 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/components"
 )
 
-const DefaultHealthcheckV1Port = 13133
+const (
+	DefaultHealthcheckV1Path = "/"
+	DefaultHealthcheckV1Port = 13133
+)
 
 type healthcheckV1Config struct {
 	components.SingleEndpointConfig `mapstructure:",squash"`
@@ -32,10 +35,14 @@ type healthcheckV1Config struct {
 // HealthCheckV1Probe returns the probe configuration for the healthcheck v1 extension.
 // Right now no TLS config is parsed.
 func HealthCheckV1Probe(logger logr.Logger, config healthcheckV1Config) (*corev1.Probe, error) {
+	path := config.Path
+	if len(path) == 0 {
+		path = DefaultHealthcheckV1Path
+	}
 	return &corev1.Probe{
 		ProbeHandler: corev1.ProbeHandler{
 			HTTPGet: &corev1.HTTPGetAction{
-				Path: config.Path,
+				Path: path,
 				Port: intstr.FromInt32(config.GetPortNumOrDefault(logger, DefaultHealthcheckV1Port)),
 			},
 		},

internal/components/extensions/healthcheckv1_test.go

@@ -83,7 +83,7 @@ func TestHealthCheckV1Probe(t *testing.T) {
 			want: &corev1.Probe{
 				ProbeHandler: corev1.ProbeHandler{
 					HTTPGet: &corev1.HTTPGetAction{
-						Path: "",
+						Path: "/",
 						Port: intstr.FromInt32(9090),
 					},
 				},
@@ -101,7 +101,7 @@ func TestHealthCheckV1Probe(t *testing.T) {
 			want: &corev1.Probe{
 				ProbeHandler: corev1.ProbeHandler{
 					HTTPGet: &corev1.HTTPGetAction{
-						Path: "",
+						Path: "/",
 						Port: intstr.FromInt32(extensions.DefaultHealthcheckV1Port),
 					},
 				},
@@ -118,7 +118,7 @@ func TestHealthCheckV1Probe(t *testing.T) {
 			want: &corev1.Probe{
 				ProbeHandler: corev1.ProbeHandler{
 					HTTPGet: &corev1.HTTPGetAction{
-						Path: "",
+						Path: "/",
 						Port: intstr.FromInt32(7070),
 					},
 				},
@@ -135,7 +135,7 @@ func TestHealthCheckV1Probe(t *testing.T) {
 			want: &corev1.Probe{
 				ProbeHandler: corev1.ProbeHandler{
 					HTTPGet: &corev1.HTTPGetAction{
-						Path: "",
+						Path: "/",
 						Port: intstr.FromInt32(extensions.DefaultHealthcheckV1Port),
 					},
 				},