Skip to content

Commit 0659a69

Browse files
committed
api: Move Status in CRD printcolumn to the end
Status content could be very long compare to other fields. Moving it to the end helps improve the visibility of other fields. Signed-off-by: Sunny <darkowlzz@protonmail.com>
1 parent 6497680 commit 0659a69

8 files changed

+16
-16
lines changed

api/v1beta2/bucket_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ func (in *Bucket) GetStatusConditions() *[]metav1.Condition {
158158
// +kubebuilder:object:root=true
159159
// +kubebuilder:subresource:status
160160
// +kubebuilder:printcolumn:name="Endpoint",type=string,JSONPath=`.spec.endpoint`
161+
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
161162
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
162163
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
163-
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
164164

165165
// Bucket is the Schema for the buckets API
166166
type Bucket struct {

api/v1beta2/gitrepository_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,9 @@ func (in *GitRepository) GetStatusConditions() *[]metav1.Condition {
230230
// +kubebuilder:resource:shortName=gitrepo
231231
// +kubebuilder:subresource:status
232232
// +kubebuilder:printcolumn:name="URL",type=string,JSONPath=`.spec.url`
233+
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
233234
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
234235
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
235-
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
236236

237237
// GitRepository is the Schema for the gitrepositories API
238238
type GitRepository struct {

api/v1beta2/helmchart_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ func (in *HelmChart) GetStatusConditions() *[]metav1.Condition {
209209
// +kubebuilder:printcolumn:name="Version",type=string,JSONPath=`.spec.version`
210210
// +kubebuilder:printcolumn:name="Source Kind",type=string,JSONPath=`.spec.sourceRef.kind`
211211
// +kubebuilder:printcolumn:name="Source Name",type=string,JSONPath=`.spec.sourceRef.name`
212+
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
212213
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
213214
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
214-
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
215215

216216
// HelmChart is the Schema for the helmcharts API
217217
type HelmChart struct {

api/v1beta2/helmrepository_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ func (in *HelmRepository) GetStatusConditions() *[]metav1.Condition {
145145
// +kubebuilder:resource:shortName=helmrepo
146146
// +kubebuilder:subresource:status
147147
// +kubebuilder:printcolumn:name="URL",type=string,JSONPath=`.spec.url`
148+
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
148149
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
149150
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
150-
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
151151

152152
// HelmRepository is the Schema for the helmrepositories API
153153
type HelmRepository struct {

config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -254,15 +254,15 @@ spec:
254254
- jsonPath: .spec.endpoint
255255
name: Endpoint
256256
type: string
257+
- jsonPath: .metadata.creationTimestamp
258+
name: Age
259+
type: date
257260
- jsonPath: .status.conditions[?(@.type=="Ready")].status
258261
name: Ready
259262
type: string
260263
- jsonPath: .status.conditions[?(@.type=="Ready")].message
261264
name: Status
262265
type: string
263-
- jsonPath: .metadata.creationTimestamp
264-
name: Age
265-
type: date
266266
name: v1beta2
267267
schema:
268268
openAPIV3Schema:

config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -353,15 +353,15 @@ spec:
353353
- jsonPath: .spec.url
354354
name: URL
355355
type: string
356+
- jsonPath: .metadata.creationTimestamp
357+
name: Age
358+
type: date
356359
- jsonPath: .status.conditions[?(@.type=="Ready")].status
357360
name: Ready
358361
type: string
359362
- jsonPath: .status.conditions[?(@.type=="Ready")].message
360363
name: Status
361364
type: string
362-
- jsonPath: .metadata.creationTimestamp
363-
name: Age
364-
type: date
365365
name: v1beta2
366366
schema:
367367
openAPIV3Schema:

config/crd/bases/source.toolkit.fluxcd.io_helmcharts.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -287,15 +287,15 @@ spec:
287287
- jsonPath: .spec.sourceRef.name
288288
name: Source Name
289289
type: string
290+
- jsonPath: .metadata.creationTimestamp
291+
name: Age
292+
type: date
290293
- jsonPath: .status.conditions[?(@.type=="Ready")].status
291294
name: Ready
292295
type: string
293296
- jsonPath: .status.conditions[?(@.type=="Ready")].message
294297
name: Status
295298
type: string
296-
- jsonPath: .metadata.creationTimestamp
297-
name: Age
298-
type: date
299299
name: v1beta2
300300
schema:
301301
openAPIV3Schema:

config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,15 @@ spec:
241241
- jsonPath: .spec.url
242242
name: URL
243243
type: string
244+
- jsonPath: .metadata.creationTimestamp
245+
name: Age
246+
type: date
244247
- jsonPath: .status.conditions[?(@.type=="Ready")].status
245248
name: Ready
246249
type: string
247250
- jsonPath: .status.conditions[?(@.type=="Ready")].message
248251
name: Status
249252
type: string
250-
- jsonPath: .metadata.creationTimestamp
251-
name: Age
252-
type: date
253253
name: v1beta2
254254
schema:
255255
openAPIV3Schema:

0 commit comments

Comments
 (0)