Reuse shared WorkloadReference type from MCPOIDCConfig

Remove duplicate WorkloadReference definition from
mcptelemetryconfig_types.go and use the shared type already
defined in mcpoidcconfig_types.go. Drop the Namespace field
(cross-namespace refs are not supported) to match the shared
type's schema.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: ChrisJBurns

cmd/thv-operator/api/v1alpha1/mcptelemetryconfig_types.go

@@ -95,18 +95,6 @@ type MCPTelemetryConfigSpec struct {
 	Prometheus *PrometheusConfig `json:"prometheus,omitempty"`
 }
 
-// WorkloadReference identifies a Kubernetes workload that references a shared config resource.
-type WorkloadReference struct {
-	// Kind is the resource kind (e.g., "MCPServer")
-	Kind string `json:"kind"`
-
-	// Namespace is the resource namespace
-	Namespace string `json:"namespace"`
-
-	// Name is the resource name
-	Name string `json:"name"`
-}
-
 // MCPTelemetryConfigStatus defines the observed state of MCPTelemetryConfig
 type MCPTelemetryConfigStatus struct {
 	// Conditions represent the latest available observations of the MCPTelemetryConfig's state

cmd/thv-operator/controllers/mcptelemetryconfig_controller.go

@@ -196,7 +196,7 @@ func (r *MCPTelemetryConfigReconciler) handleDeletion(
 	if len(referencingWorkloads) > 0 {
 		names := make([]string, 0, len(referencingWorkloads))
 		for _, ref := range referencingWorkloads {
-			names = append(names, fmt.Sprintf("%s/%s", ref.Namespace, ref.Name))
+			names = append(names, fmt.Sprintf("%s/%s", ref.Kind, ref.Name))
 		}
 		msg := fmt.Sprintf("cannot delete: still referenced by MCPServer(s): %v", names)
 		logger.Info(msg, "telemetryConfig", telemetryConfig.Name)
@@ -239,19 +239,12 @@ func (r *MCPTelemetryConfigReconciler) findReferencingWorkloads(
 		if server.Spec.TelemetryConfigRef != nil &&
 			server.Spec.TelemetryConfigRef.Name == telemetryConfig.Name {
 			refs = append(refs, mcpv1alpha1.WorkloadReference{
-				Kind:      "MCPServer",
-				Namespace: server.Namespace,
-				Name:      server.Name,
+				Kind: "MCPServer",
+				Name: server.Name,
 			})
 		}
 	}
 	slices.SortFunc(refs, func(a, b mcpv1alpha1.WorkloadReference) int {
-		if a.Namespace != b.Namespace {
-			if a.Namespace < b.Namespace {
-				return -1
-			}
-			return 1
-		}
 		if a.Name < b.Name {
 			return -1
 		}
@@ -266,6 +259,6 @@ func (r *MCPTelemetryConfigReconciler) findReferencingWorkloads(
 // workloadRefsEqual compares two WorkloadReference slices for equality.
 func workloadRefsEqual(a, b []mcpv1alpha1.WorkloadReference) bool {
 	return slices.EqualFunc(a, b, func(x, y mcpv1alpha1.WorkloadReference) bool {
-		return x.Kind == y.Kind && x.Namespace == y.Namespace && x.Name == y.Name
+		return x.Kind == y.Kind && x.Name == y.Name
 	})
 }

cmd/thv-operator/controllers/mcptelemetryconfig_controller_test.go

@@ -704,8 +704,8 @@ func TestMCPTelemetryConfigReconciler_ReferenceTracking(t *testing.T) {
 
 	// ReferencingWorkloads should list server-a and server-b (sorted), but not server-c
 	assert.Equal(t, []mcpv1alpha1.WorkloadReference{
-		{Kind: "MCPServer", Namespace: "default", Name: "server-a"},
-		{Kind: "MCPServer", Namespace: "default", Name: "server-b"},
+		{Kind: "MCPServer", Name: "server-a"},
+		{Kind: "MCPServer", Name: "server-b"},
 	}, updated.Status.ReferencingWorkloads)
 }
 

deploy/charts/operator-crds/files/crds/toolhive.stacklok.dev_mcptelemetryconfigs.yaml

@@ -250,22 +250,24 @@ spec:
                 description: ReferencingWorkloads lists workloads that reference this
                   MCPTelemetryConfig
                 items:
-                  description: WorkloadReference identifies a Kubernetes workload
-                    that references a shared config resource.
+                  description: |-
+                    WorkloadReference identifies a workload that references a shared configuration resource.
+                    Namespace is implicit — cross-namespace references are not supported.
                   properties:
                     kind:
-                      description: Kind is the resource kind (e.g., "MCPServer")
+                      description: Kind is the type of workload resource
+                      enum:
+                      - MCPServer
+                      - VirtualMCPServer
+                      - MCPRemoteProxy
                       type: string
                     name:
-                      description: Name is the resource name
-                      type: string
-                    namespace:
-                      description: Namespace is the resource namespace
+                      description: Name is the name of the workload resource
+                      minLength: 1
                       type: string
                   required:
                   - kind
                   - name
-                  - namespace
                   type: object
                 type: array
             type: object

deploy/charts/operator-crds/templates/toolhive.stacklok.dev_mcptelemetryconfigs.yaml

@@ -253,22 +253,24 @@ spec:
                 description: ReferencingWorkloads lists workloads that reference this
                   MCPTelemetryConfig
                 items:
-                  description: WorkloadReference identifies a Kubernetes workload
-                    that references a shared config resource.
+                  description: |-
+                    WorkloadReference identifies a workload that references a shared configuration resource.
+                    Namespace is implicit — cross-namespace references are not supported.
                   properties:
                     kind:
-                      description: Kind is the resource kind (e.g., "MCPServer")
+                      description: Kind is the type of workload resource
+                      enum:
+                      - MCPServer
+                      - VirtualMCPServer
+                      - MCPRemoteProxy
                       type: string
                     name:
-                      description: Name is the resource name
-                      type: string
-                    namespace:
-                      description: Namespace is the resource namespace
+                      description: Name is the name of the workload resource
+                      minLength: 1
                       type: string
                   required:
                   - kind
                   - name
-                  - namespace
                   type: object
                 type: array
             type: object