Skip to content

Remove referencingWorkloads/referenceCount from config CRD statuses #5631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChrisJBurns wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Remove referencingWorkloads/referenceCount from config CRD statuses #5631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
878a527
Stop storing referencing workloads on config CRD statuses
ChrisJBurns Jun 24, 2026
7e3ce95
Update config integration suites for removed status fields
ChrisJBurns Jun 24, 2026
befb6b3
Regenerate config CRD manifests and API docs
ChrisJBurns Jun 24, 2026
94cdfbe
Remove orphaned WorkloadRefsEqual helper
ChrisJBurns Jun 24, 2026
024013a
Update operator architecture docs for removed status fields
ChrisJBurns Jun 24, 2026
b837630
Add ExternalAuth deletion block/unblock integration test
ChrisJBurns Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions cmd/thv-operator/api/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ type EmbeddingServerList struct {
//+kubebuilder:resource:shortName=extauth;mcpextauth,categories=toolhive
//+kubebuilder:printcolumn:name="Type",type=string,JSONPath=`.spec.type`
//+kubebuilder:printcolumn:name="Valid",type=string,JSONPath=`.status.conditions[?(@.type=='Valid')].status`
//+kubebuilder:printcolumn:name="References",type=integer,JSONPath=`.status.referenceCount`
//+kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`

// MCPExternalAuthConfig is the deprecated v1alpha1 version of the MCPExternalAuthConfig resource.
Expand Down Expand Up @@ -105,7 +104,6 @@ type MCPGroupList struct {
//+kubebuilder:resource:shortName=mcpoidc,categories=toolhive
//+kubebuilder:printcolumn:name="Source",type=string,JSONPath=`.spec.type`
//+kubebuilder:printcolumn:name="Valid",type=string,JSONPath=`.status.conditions[?(@.type=='Valid')].status`
//+kubebuilder:printcolumn:name="References",type=integer,JSONPath=`.status.referenceCount`
//+kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`

// MCPOIDCConfig is the deprecated v1alpha1 version of the MCPOIDCConfig resource.
Expand Down Expand Up @@ -134,7 +132,6 @@ type MCPOIDCConfigList struct {
//+kubebuilder:resource:shortName=authzcfg,categories=toolhive
//+kubebuilder:printcolumn:name="Type",type=string,JSONPath=`.spec.type`
//+kubebuilder:printcolumn:name="Valid",type=string,JSONPath=`.status.conditions[?(@.type=='Valid')].status`
//+kubebuilder:printcolumn:name="References",type=integer,JSONPath=`.status.referenceCount`
//+kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`

// MCPAuthzConfig is the deprecated v1alpha1 version of the MCPAuthzConfig resource.
Expand Down Expand Up @@ -318,7 +315,6 @@ type MCPTelemetryConfigList struct {
//+kubebuilder:metadata:labels=toolhive.stacklok.dev/auto-migrate-storage-version=true
//+kubebuilder:resource:shortName=mwc,categories=toolhive
//+kubebuilder:printcolumn:name="Valid",type=string,JSONPath=`.status.conditions[?(@.type=='Valid')].status`
//+kubebuilder:printcolumn:name="References",type=string,JSONPath=`.status.referencingWorkloads`
//+kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`

// MCPWebhookConfig is the Schema for the mcpwebhookconfigs API.
Expand Down Expand Up @@ -346,7 +342,6 @@ type MCPWebhookConfigList struct {
//+kubebuilder:subresource:status
//+kubebuilder:resource:shortName=tc;toolconfig,categories=toolhive
//+kubebuilder:printcolumn:name="Valid",type=string,JSONPath=`.status.conditions[?(@.type=='Valid')].status`
//+kubebuilder:printcolumn:name="References",type=integer,JSONPath=`.status.referenceCount`
//+kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`

// MCPToolConfig is the deprecated v1alpha1 version of the MCPToolConfig resource.
Expand Down
16 changes: 0 additions & 16 deletions cmd/thv-operator/api/v1beta1/mcpauthzconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,6 @@ type MCPAuthzConfigStatus struct {
// ConfigHash is a hash of the current configuration for change detection
// +optional
ConfigHash string `json:"configHash,omitempty"`

// ReferenceCount is the number of workloads referencing this config.
// +optional
ReferenceCount int32 `json:"referenceCount,omitempty"`

// ReferencingWorkloads is a list of workload resources that reference this MCPAuthzConfig.
// Each entry identifies the workload by kind and name. The map key is the
// (kind, name) pair so two workloads of different kinds that share a name
// (e.g., an MCPServer "foo" and a VirtualMCPServer "foo") are distinct
// entries rather than colliding under merge-patch semantics.
// +listType=map
// +listMapKey=kind
// +listMapKey=name
// +optional
ReferencingWorkloads []WorkloadReference `json:"referencingWorkloads,omitempty"`
}

// +kubebuilder:object:root=true
Expand All @@ -82,7 +67,6 @@ type MCPAuthzConfigStatus struct {
// +kubebuilder:resource:shortName=authzcfg,categories=toolhive
// +kubebuilder:printcolumn:name="Type",type=string,JSONPath=`.spec.type`
// +kubebuilder:printcolumn:name="Valid",type=string,JSONPath=`.status.conditions[?(@.type=='Valid')].status`
// +kubebuilder:printcolumn:name="References",type=integer,JSONPath=`.status.referenceCount`
// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`

// MCPAuthzConfig is the Schema for the mcpauthzconfigs API.
Expand Down
16 changes: 0 additions & 16 deletions cmd/thv-operator/api/v1beta1/mcpexternalauthconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,21 +1317,6 @@ type MCPExternalAuthConfigStatus struct {
// ConfigHash is a hash of the current configuration for change detection
// +optional
ConfigHash string `json:"configHash,omitempty"`

// ReferenceCount is the number of workloads referencing this config.
// +optional
ReferenceCount int32 `json:"referenceCount,omitempty"`

// ReferencingWorkloads is a list of workload resources that reference this MCPExternalAuthConfig.
// Each entry identifies the workload by kind and name. The map key is the
// (kind, name) pair so two workloads of different kinds that share a name
// (e.g., an MCPServer "foo" and a VirtualMCPServer "foo") are distinct
// entries rather than colliding under merge-patch semantics.
// +listType=map
// +listMapKey=kind
// +listMapKey=name
// +optional
ReferencingWorkloads []WorkloadReference `json:"referencingWorkloads,omitempty"`
}

// +kubebuilder:object:root=true
Expand All @@ -1341,7 +1326,6 @@ type MCPExternalAuthConfigStatus struct {
// +kubebuilder:resource:shortName=extauth;mcpextauth,categories=toolhive
// +kubebuilder:printcolumn:name="Type",type=string,JSONPath=`.spec.type`
// +kubebuilder:printcolumn:name="Valid",type=string,JSONPath=`.status.conditions[?(@.type=='Valid')].status`
// +kubebuilder:printcolumn:name="References",type=integer,JSONPath=`.status.referenceCount`
// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`

// MCPExternalAuthConfig is the Schema for the mcpexternalauthconfigs API.
Expand Down
16 changes: 0 additions & 16 deletions cmd/thv-operator/api/v1beta1/mcpoidcconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,21 +184,6 @@ type MCPOIDCConfigStatus struct {
// ConfigHash is a hash of the current configuration for change detection
// +optional
ConfigHash string `json:"configHash,omitempty"`

// ReferenceCount is the number of workloads referencing this config.
// +optional
ReferenceCount int32 `json:"referenceCount,omitempty"`

// ReferencingWorkloads is a list of workload resources that reference this MCPOIDCConfig.
// Each entry identifies the workload by kind and name. The map key is the
// (kind, name) pair so two workloads of different kinds that share a name
// (e.g., an MCPServer "foo" and a VirtualMCPServer "foo") are distinct
// entries rather than colliding under merge-patch semantics.
// +listType=map
// +listMapKey=kind
// +listMapKey=name
// +optional
ReferencingWorkloads []WorkloadReference `json:"referencingWorkloads,omitempty"`
}

// +kubebuilder:object:root=true
Expand All @@ -208,7 +193,6 @@ type MCPOIDCConfigStatus struct {
// +kubebuilder:resource:shortName=mcpoidc,categories=toolhive
// +kubebuilder:printcolumn:name="Source",type=string,JSONPath=`.spec.type`
// +kubebuilder:printcolumn:name="Valid",type=string,JSONPath=`.status.conditions[?(@.type=='Valid')].status`
// +kubebuilder:printcolumn:name="References",type=integer,JSONPath=`.status.referenceCount`
// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`

// MCPOIDCConfig is the Schema for the mcpoidcconfigs API.
Expand Down
6 changes: 0 additions & 6 deletions cmd/thv-operator/api/v1beta1/mcptelemetryconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,6 @@ type MCPTelemetryConfigStatus struct {
// ConfigHash is a hash of the current configuration for change detection
// +optional
ConfigHash string `json:"configHash,omitempty"`

// ReferencingWorkloads lists workloads that reference this MCPTelemetryConfig
// +listType=map
// +listMapKey=name
// +optional
ReferencingWorkloads []WorkloadReference `json:"referencingWorkloads,omitempty"`
}

// +kubebuilder:object:root=true
Expand Down
7 changes: 0 additions & 7 deletions cmd/thv-operator/api/v1beta1/mcpwebhookconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,4 @@ type MCPWebhookConfigStatus struct {
// ConfigHash is a hash of the spec, used for detecting changes
// +optional
ConfigHash string `json:"configHash,omitempty"`

// ReferencingWorkloads is a list of workload resources that reference this MCPWebhookConfig.
// Each entry identifies the workload by kind and name.
// +listType=map
// +listMapKey=name
// +optional
ReferencingWorkloads []WorkloadReference `json:"referencingWorkloads,omitempty"`
}
12 changes: 0 additions & 12 deletions cmd/thv-operator/api/v1beta1/toolconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,6 @@ type MCPToolConfigStatus struct {
// ConfigHash is a hash of the current configuration for change detection
// +optional
ConfigHash string `json:"configHash,omitempty"`

// ReferenceCount is the number of workloads referencing this config.
// +optional
ReferenceCount int32 `json:"referenceCount,omitempty"`

// ReferencingWorkloads is a list of workload resources that reference this MCPToolConfig.
// Each entry identifies the workload by kind and name.
// +listType=map
// +listMapKey=name
// +optional
ReferencingWorkloads []WorkloadReference `json:"referencingWorkloads,omitempty"`
}

// +kubebuilder:object:root=true
Expand All @@ -115,7 +104,6 @@ type MCPToolConfigStatus struct {
// +kubebuilder:metadata:labels=toolhive.stacklok.dev/auto-migrate-storage-version=true
// +kubebuilder:resource:shortName=tc;toolconfig,categories=toolhive
// +kubebuilder:printcolumn:name="Valid",type=string,JSONPath=`.status.conditions[?(@.type=='Valid')].status`
// +kubebuilder:printcolumn:name="References",type=integer,JSONPath=`.status.referenceCount`
// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`

// MCPToolConfig is the Schema for the mcptoolconfigs API.
Expand Down
30 changes: 0 additions & 30 deletions cmd/thv-operator/api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/thv-operator/controllers/config_controller_events_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func TestMCPExternalAuthConfigReconciler_EmitsDeletionBlockedEvent(t *testing.T)
}

// TestMCPExternalAuthConfigReconciler_EmitsRecoveryOnSteadyStatePath covers the
// recovery transition that flows through updateReferencingWorkloads rather than
// recovery transition that flows through updateSteadyStateStatus rather than
// handleConfigHashChange: a config whose stored hash already matches the current
// spec (no hash change) but whose Valid condition is still False from an earlier
// failure. Reconcile must emit a single Normal ConfigValid event.
Expand Down
Loading
Loading