feat: improve status on team operator resources

Makefile

@@ -93,6 +93,8 @@ help: ## Display this help.
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	# Normalize jsonPath filter quoting: controller-gen emits single quotes, kubectl prefers double
+	$(SED) -i "s/@.type=='Ready'/@.type==\"Ready\"/g" config/crd/bases/core.posit.team_connects.yaml config/crd/bases/core.posit.team_postgresdatabases.yaml config/crd/bases/core.posit.team_sites.yaml
 
 .PHONY: generate-all
 generate-all: generate generate-client generate-openapi
@@ -239,6 +241,8 @@ helm-generate: manifests kubebuilder ## Regenerate Helm chart from kustomize
 	rm -f dist/chart/templates/rbac/auth_proxy_service.yaml
 	# Remove kubebuilder-generated test workflow - we use our own CI workflows
 	rm -f .github/workflows/test-chart.yml
+	# Normalize jsonPath filter quoting in Helm chart CRDs (matches config/crd/bases fixup above)
+	$(SED) -i "s/@.type=='Ready'/@.type==\"Ready\"/g" dist/chart/templates/crd/core.posit.team_connects.yaml dist/chart/templates/crd/core.posit.team_postgresdatabases.yaml dist/chart/templates/crd/core.posit.team_sites.yaml
 
 .PHONY: helm-lint
 helm-lint: ## Lint the Helm chart

api/core/v1beta1/chronicle_types.go

@@ -43,12 +43,17 @@ type ChronicleSpec struct {
 
 // ChronicleStatus defines the observed state of Chronicle
 type ChronicleStatus struct {
+	CommonProductStatus `json:",inline"`
+	// +optional
 	Ready bool `json:"ready"`
 }
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:shortName={pcr,chr},path=chronicles
+// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=='Ready')].status`
+// +kubebuilder:printcolumn:name="Version",type=string,JSONPath=`.status.version`
+// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 // +genclient
 // +k8s:openapi-gen=true
 

api/core/v1beta1/connect_types.go

@@ -155,13 +155,18 @@ type ConnectSpec struct {
 
 // ConnectStatus defines the observed state of Connect
 type ConnectStatus struct {
-	KeySecretRef corev1.SecretReference `json:"keySecretRef,omitempty"`
-	Ready        bool                   `json:"ready"`
+	CommonProductStatus `json:",inline"`
+	KeySecretRef        corev1.SecretReference `json:"keySecretRef,omitempty"`
+	// +optional
+	Ready bool `json:"ready"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:shortName={con,cons},path=connects
+//+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
+//+kubebuilder:printcolumn:name="Version",type="string",JSONPath=".status.version"
+//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 //+genclient
 //+k8s:openapi-gen=true
 

api/core/v1beta1/flightdeck_types.go

@@ -65,12 +65,17 @@ type FlightdeckSpec struct {
 
 // FlightdeckStatus defines the observed state of Flightdeck
 type FlightdeckStatus struct {
+	CommonProductStatus `json:",inline"`
 	// Ready indicates whether the Flightdeck deployment is ready
+	// +optional
 	Ready bool `json:"ready"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=='Ready')].status`
+//+kubebuilder:printcolumn:name="Version",type=string,JSONPath=`.status.version`
+//+kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 //+genclient
 //+k8s:openapi-gen=true
 

api/core/v1beta1/packagemanager_types.go

@@ -93,13 +93,18 @@ type PackageManagerSpec struct {
 
 // PackageManagerStatus defines the observed state of PackageManager
 type PackageManagerStatus struct {
-	KeySecretRef v1.SecretReference `json:"keySecretRef,omitempty"`
-	Ready        bool               `json:"ready"`
+	CommonProductStatus `json:",inline"`
+	KeySecretRef        v1.SecretReference `json:"keySecretRef,omitempty"`
+	// +optional
+	Ready bool `json:"ready"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:shortName={pm,pms},path=packagemanagers
+//+kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=='Ready')].status`
+//+kubebuilder:printcolumn:name="Version",type=string,JSONPath=`.status.version`
+//+kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 //+genclient
 //+k8s:openapi-gen=true
 

api/core/v1beta1/postgresdatabase_types.go

@@ -48,11 +48,15 @@ type PostgresDatabaseSpecTeardown struct {
 }
 
 // PostgresDatabaseStatus defines the observed state of PostgresDatabase
-type PostgresDatabaseStatus struct{}
+type PostgresDatabaseStatus struct {
+	CommonProductStatus `json:",inline"`
+}
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:shortName={pgdb,pgdbs},path=postgresdatabases
+//+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
+//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 //+genclient
 
 // PostgresDatabase is the Schema for the postgresdatabases API

api/core/v1beta1/site_types.go

@@ -147,6 +147,9 @@ type AzureFilesConfig struct {
 	ShareSizeGiB int `json:"shareSizeGiB,omitempty"`
 }
 
+// InternalFlightdeckSpec configures Flightdeck within a Site.
+// Flightdeck is stateless, so there is no Teardown field: disabling removes all resources
+// immediately (equivalent to teardown for stateful products).
 type InternalFlightdeckSpec struct {
 	// Enabled controls whether Flightdeck is deployed. Defaults to true if not specified.
 	// Set to false to explicitly disable Flightdeck deployment.
@@ -626,12 +629,33 @@ type ApiSettingsConfig struct {
 
 // SiteStatus defines the observed state of Site
 type SiteStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
+	CommonProductStatus `json:",inline"`
+
+	// ConnectReady indicates whether the Connect child resource is ready.
+	// +optional
+	ConnectReady bool `json:"connectReady,omitempty"`
+
+	// WorkbenchReady indicates whether the Workbench child resource is ready.
+	// +optional
+	WorkbenchReady bool `json:"workbenchReady,omitempty"`
+
+	// PackageManagerReady indicates whether the PackageManager child resource is ready.
+	// +optional
+	PackageManagerReady bool `json:"packageManagerReady,omitempty"`
+
+	// ChronicleReady indicates whether the Chronicle child resource is ready.
+	// +optional
+	ChronicleReady bool `json:"chronicleReady,omitempty"`
+
+	// FlightdeckReady indicates whether the Flightdeck child resource is ready.
+	// +optional
+	FlightdeckReady bool `json:"flightdeckReady,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
+//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 //+genclient
 //+k8s:openapi-gen=true
 

api/core/v1beta1/status.go

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2023-2026 Posit Software, PBC
+
+package v1beta1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// CommonProductStatus contains the common status fields shared by all product CRDs.
+// Embed this struct inline in product-specific Status types.
+type CommonProductStatus struct {
+	// Conditions represent the latest available observations of the resource's current state.
+	// +optional
+	// +patchMergeKey=type
+	// +patchStrategy=merge
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
+
+	// ObservedGeneration is the most recent generation observed for this resource.
+	// It corresponds to the resource's generation, which is updated on mutation by the API Server.
+	// +optional
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+
+	// Version is the version of the product image being deployed.
+	// +optional
+	Version string `json:"version,omitempty"`
+}

api/core/v1beta1/workbench_types.go

@@ -120,13 +120,18 @@ type WorkbenchSpec struct {
 
 // WorkbenchStatus defines the observed state of Workbench
 type WorkbenchStatus struct {
+	CommonProductStatus `json:",inline"`
+	// +optional
 	Ready        bool                   `json:"ready"`
 	KeySecretRef corev1.SecretReference `json:"keySecretRef,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:shortName={wb,wbs},path=workbenches,singular=workbench
+//+kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=='Ready')].status`
+//+kubebuilder:printcolumn:name="Version",type=string,JSONPath=`.status.version`
+//+kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 //+genclient
 //+k8s:openapi-gen=true