Skip to content

Commit 9bcb3db

Browse files
committed
replace conditional synced condition with ready condition in printcolumn
1 parent 06bffb9 commit 9bcb3db

File tree

3 files changed

+2
-26
lines changed

3 files changed

+2
-26
lines changed

pkg/config/resource.go

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ type PrintConfig struct {
395395
// resource in `kubectl get` response.
396396
//
397397
// Default value is true.
398+
// Deprecated: We now print Ready condition by default
398399
AddSyncedColumn *bool `json:"add_synced_column"`
399400
// OrderBy is the field used to sort the list of PrinterColumn options.
400401
OrderBy string `json:"order_by"`
@@ -485,23 +486,6 @@ func (c *Config) ResourceDisplaysAgeColumn(resourceName string) bool {
485486
return false
486487
}
487488

488-
// ResourceDisplaysSyncedColumn returns true if the resource is
489-
// configured to display the synced status.
490-
func (c *Config) ResourceDisplaysSyncedColumn(resourceName string) bool {
491-
if c == nil {
492-
return false
493-
}
494-
rConfig, ok := c.Resources[resourceName]
495-
if !ok {
496-
return false
497-
}
498-
if rConfig.Print != nil {
499-
// default value should be true.
500-
return rConfig.Print.AddSyncedColumn == nil || *rConfig.Print.AddSyncedColumn
501-
}
502-
return false
503-
}
504-
505489
// ResourceSetsSingleAttribute returns true if the supplied resource name has
506490
// a SetAttributes operation that only actually changes a single attribute at a
507491
// time. See: SNS SetTopicAttributes API call, which is entirely different from

pkg/model/crd.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -599,12 +599,6 @@ func (r *CRD) PrintAgeColumn() bool {
599599
return r.cfg.ResourceDisplaysAgeColumn(r.Names.Camel)
600600
}
601601

602-
// PrintSyncedColumn returns whether the code generator should append 'Sync'
603-
// kubebuilder:printcolumn comment marker
604-
func (r *CRD) PrintSyncedColumn() bool {
605-
return r.cfg.ResourceDisplaysSyncedColumn(r.Names.Camel)
606-
}
607-
608602
func (r *CRD) addAdditionalPrinterColumns(additionalColumns []*ackgenconfig.AdditionalColumnConfig) {
609603
for _, additionalColumn := range additionalColumns {
610604
printerColumn := &PrinterColumn{}

templates/apis/crd.go.tpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ type {{ .CRD.Kind }}Status struct {
6060
{{- range $column := .CRD.AdditionalPrinterColumns }}
6161
// +kubebuilder:printcolumn:name="{{$column.Name}}",type={{$column.Type}},priority={{$column.Priority}},JSONPath=`{{$column.JSONPath}}`
6262
{{- end }}
63-
{{- if .CRD.PrintSyncedColumn }}
64-
// +kubebuilder:printcolumn:name="Synced",type="string",priority=0,JSONPath=".status.conditions[?(@.type==\"ACK.ResourceSynced\")].status"
65-
{{- end }}
63+
// +kubebuilder:printcolumn:name="Ready",type="string",priority=0,JSONPath=".status.conditions[?(@.type==\"Ready\")].status"
6664
{{- if .CRD.PrintAgeColumn }}
6765
// +kubebuilder:printcolumn:name="Age",type="date",priority=0,JSONPath=".metadata.creationTimestamp"
6866
{{- end }}

0 commit comments

Comments
 (0)