From 9bcb3db833c9423d5c968d7990481755e63ae602 Mon Sep 17 00:00:00 2001 From: michaelhtm <98621731+michaelhtm@users.noreply.github.com> Date: Mon, 1 Dec 2025 16:59:59 -0800 Subject: [PATCH] replace conditional synced condition with ready condition in printcolumn --- pkg/config/resource.go | 18 +----------------- pkg/model/crd.go | 6 ------ templates/apis/crd.go.tpl | 4 +--- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/pkg/config/resource.go b/pkg/config/resource.go index ba946179..d97b5318 100644 --- a/pkg/config/resource.go +++ b/pkg/config/resource.go @@ -395,6 +395,7 @@ type PrintConfig struct { // resource in `kubectl get` response. // // Default value is true. + // Deprecated: We now print Ready condition by default AddSyncedColumn *bool `json:"add_synced_column"` // OrderBy is the field used to sort the list of PrinterColumn options. OrderBy string `json:"order_by"` @@ -485,23 +486,6 @@ func (c *Config) ResourceDisplaysAgeColumn(resourceName string) bool { return false } -// ResourceDisplaysSyncedColumn returns true if the resource is -// configured to display the synced status. -func (c *Config) ResourceDisplaysSyncedColumn(resourceName string) bool { - if c == nil { - return false - } - rConfig, ok := c.Resources[resourceName] - if !ok { - return false - } - if rConfig.Print != nil { - // default value should be true. - return rConfig.Print.AddSyncedColumn == nil || *rConfig.Print.AddSyncedColumn - } - return false -} - // ResourceSetsSingleAttribute returns true if the supplied resource name has // a SetAttributes operation that only actually changes a single attribute at a // time. See: SNS SetTopicAttributes API call, which is entirely different from diff --git a/pkg/model/crd.go b/pkg/model/crd.go index 03116b64..cb18dcdc 100644 --- a/pkg/model/crd.go +++ b/pkg/model/crd.go @@ -599,12 +599,6 @@ func (r *CRD) PrintAgeColumn() bool { return r.cfg.ResourceDisplaysAgeColumn(r.Names.Camel) } -// PrintSyncedColumn returns whether the code generator should append 'Sync' -// kubebuilder:printcolumn comment marker -func (r *CRD) PrintSyncedColumn() bool { - return r.cfg.ResourceDisplaysSyncedColumn(r.Names.Camel) -} - func (r *CRD) addAdditionalPrinterColumns(additionalColumns []*ackgenconfig.AdditionalColumnConfig) { for _, additionalColumn := range additionalColumns { printerColumn := &PrinterColumn{} diff --git a/templates/apis/crd.go.tpl b/templates/apis/crd.go.tpl index ad57b72b..6db6f124 100644 --- a/templates/apis/crd.go.tpl +++ b/templates/apis/crd.go.tpl @@ -60,9 +60,7 @@ type {{ .CRD.Kind }}Status struct { {{- range $column := .CRD.AdditionalPrinterColumns }} // +kubebuilder:printcolumn:name="{{$column.Name}}",type={{$column.Type}},priority={{$column.Priority}},JSONPath=`{{$column.JSONPath}}` {{- end }} -{{- if .CRD.PrintSyncedColumn }} -// +kubebuilder:printcolumn:name="Synced",type="string",priority=0,JSONPath=".status.conditions[?(@.type==\"ACK.ResourceSynced\")].status" -{{- end }} +// +kubebuilder:printcolumn:name="Ready",type="string",priority=0,JSONPath=".status.conditions[?(@.type==\"Ready\")].status" {{- if .CRD.PrintAgeColumn }} // +kubebuilder:printcolumn:name="Age",type="date",priority=0,JSONPath=".metadata.creationTimestamp" {{- end }}