Skip to content

Commit 16026e4

Browse files
authored
Add kubebuilder:printcolumns for all the supported resources (#91)
Signed-off-by: Amine Hilaly <[email protected]> By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 0c20f7a commit 16026e4

21 files changed

+648
-17
lines changed

apis/v1alpha1/access_entry.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2024-01-16T04:34:04Z"
3-
build_hash: 1c24ff7816c71b9510556c8c4f120a84f0f2d242
2+
build_date: "2024-01-18T01:05:09Z"
3+
build_hash: af2855c8761aecc951b4866d1706cee3715138d1
44
go_version: go1.21.5
5-
version: v0.28.0-12-g1c24ff7
6-
api_directory_checksum: 56d4e625c425c581f44a2832df7029be02ee13be
5+
version: v0.28.0-16-gaf2855c
6+
api_directory_checksum: 485ad8b36cb1f4d10c69854ea76f8e60179a6163
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.49.13
99
generator_config_info:
10-
file_checksum: 66e3285863ee60ad17b182cf2d54b4d1defddc7f
10+
file_checksum: 7c301b49c51d0e2a61fbb8888935136ce69aef5d
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/addon.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/cluster.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/fargate_profile.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/generator.yaml

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,33 @@ resources:
4141
- MissingAction
4242
- MissingParameter
4343
- ValidationError
44+
print:
45+
add_age_column: true
46+
add_synced_column: true
47+
order_by: index
48+
additional_columns:
49+
- name: CLUSTER
50+
json_path: .spec.clusterName
51+
type: string
52+
index: 10
53+
- name: ADDONVERSION
54+
json_path: .spec.addonVersion
55+
type: string
56+
index: 20
57+
- name: RESOLVECONFLICTS
58+
json_path: .spec.resolveConflicts
59+
type: string
60+
index: 30
61+
- name: STATUS
62+
json_path: .status.status
63+
type: string
64+
index: 40
65+
priority: 1
66+
- name: SERVICEACCOUNTROLEARN
67+
json_path: .spec.serviceAccountRoleARN
68+
type: string
69+
index: 50
70+
priority: 1
4471
Cluster:
4572
fields:
4673
EncryptionProvider.Provider.KeyArn:
@@ -94,6 +121,29 @@ resources:
94121
template_path: hooks/cluster/sdk_file_end.go.tpl
95122
update_operation:
96123
custom_method_name: customUpdate
124+
print:
125+
add_age_column: true
126+
add_synced_column: true
127+
order_by: index
128+
additional_columns:
129+
- name: VERSION
130+
json_path: .spec.version
131+
type: string
132+
index: 10
133+
- name: STATUS
134+
json_path: .status.status
135+
type: string
136+
index: 20
137+
- name: PLATFORMVERSION
138+
json_path: .status.platformVersion
139+
type: string
140+
index: 30
141+
priority: 1
142+
- name: ENDPOINT
143+
json_path: .status.endpoint
144+
type: string
145+
index: 40
146+
priority: 1
97147
FargateProfile:
98148
fields:
99149
ClusterName:
@@ -150,6 +200,24 @@ resources:
150200
- path: Status.Status
151201
in:
152202
- ACTIVE
203+
print:
204+
add_age_column: true
205+
add_synced_column: true
206+
order_by: index
207+
additional_columns:
208+
- name: CLUSTER
209+
json_path: .spec.clusterName
210+
type: string
211+
index: 10
212+
- name: STATUS
213+
json_path: .status.status
214+
type: string
215+
index: 20
216+
- name: PODEXECUTIONROLEARN
217+
json_path: .spec.podExecutionRoleARN
218+
type: string
219+
index: 30
220+
priority: 1
153221
Nodegroup:
154222
fields:
155223
ClusterName:
@@ -217,6 +285,45 @@ resources:
217285
template_path: hooks/nodegroup/sdk_file_end.go.tpl
218286
update_operation:
219287
custom_method_name: customUpdate
288+
print:
289+
add_age_column: true
290+
add_synced_column: true
291+
order_by: index
292+
additional_columns:
293+
- name: CLUSTER
294+
json_path: .spec.clusterName
295+
type: string
296+
index: 10
297+
- name: VERSION
298+
json_path: .spec.version
299+
type: string
300+
index: 20
301+
- name: STATUS
302+
json_path: .status.status
303+
type: string
304+
index: 30
305+
- name: RELEASEVERSION
306+
json_path: .spec.releaseVersion
307+
type: string
308+
index: 40
309+
priority: 1
310+
- name: DESIREDSIZE
311+
json_path: .spec.scalingConfig.desiredSize
312+
type: integer
313+
index: 50
314+
- name: MINSIZE
315+
json_path: .spec.scalingConfig.minSize
316+
type: integer
317+
index: 60
318+
- name: MAXSIZE
319+
json_path: .spec.scalingConfig.maxSize
320+
type: integer
321+
index: 70
322+
- name: DISKSIZE
323+
json_path: .spec.diskSize
324+
type: integer
325+
index: 80
326+
priority: 1
220327
PodIdentityAssociation:
221328
fields:
222329
ClusterName:
@@ -229,6 +336,33 @@ resources:
229336
service_name: iam
230337
resource: Role
231338
path: Status.ACKResourceMetadata.ARN
339+
print:
340+
add_age_column: true
341+
add_synced_column: true
342+
order_by: index
343+
additional_columns:
344+
- name: CLUSTER
345+
json_path: .spec.clusterName
346+
type: string
347+
index: 10
348+
- name: NAMESPACE
349+
json_path: .spec.namespace
350+
type: string
351+
index: 20
352+
- name: SERVICEACCOUNT
353+
json_path: .spec.serviceaccount
354+
type: string
355+
index: 30
356+
- name: ROLEARN
357+
json_path: .spec.roleARN
358+
type: string
359+
index: 40
360+
priority: 1
361+
- name: ASSOCIATIONID
362+
json_path: .status.associationID
363+
type: string
364+
index: 50
365+
priority: 1
232366
AccessEntry:
233367
fields:
234368
ClusterName:
@@ -248,6 +382,28 @@ resources:
248382
template_path: hooks/access_entry/sdk_read_one_post_set_output.go.tpl
249383
sdk_update_pre_build_request:
250384
template_path: hooks/access_entry/sdk_update_pre_build_request.go.tpl
385+
print:
386+
add_age_column: true
387+
add_synced_column: true
388+
order_by: index
389+
additional_columns:
390+
- name: CLUSTER
391+
json_path: .spec.clusterName
392+
type: string
393+
index: 10
394+
- name: TYPE
395+
json_path: .spec.type
396+
type: string
397+
index: 20
398+
- name: USERNAME
399+
json_path: .spec.username
400+
type: string
401+
index: 30
402+
- name: PRINCIPALARN
403+
json_path: .spec.principalARN
404+
type: string
405+
index: 40
406+
priority: 1
251407
ignore:
252408
resource_names:
253409
- EksAnywhereSubscription

apis/v1alpha1/nodegroup.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/pod_identity_association.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/eks.services.k8s.aws_accessentries.yaml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,27 @@ spec:
1515
singular: accessentry
1616
scope: Namespaced
1717
versions:
18-
- name: v1alpha1
18+
- additionalPrinterColumns:
19+
- jsonPath: .spec.clusterName
20+
name: CLUSTER
21+
type: string
22+
- jsonPath: .spec.type
23+
name: TYPE
24+
type: string
25+
- jsonPath: .spec.username
26+
name: USERNAME
27+
type: string
28+
- jsonPath: .spec.principalARN
29+
name: PRINCIPALARN
30+
priority: 1
31+
type: string
32+
- jsonPath: .status.conditions[?(@.type=="ACK.ResourceSynced")].status
33+
name: Synced
34+
type: string
35+
- jsonPath: .metadata.creationTimestamp
36+
name: Age
37+
type: date
38+
name: v1alpha1
1939
schema:
2040
openAPIV3Schema:
2141
description: AccessEntry is the Schema for the AccessEntries API

config/crd/bases/eks.services.k8s.aws_addons.yaml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,31 @@ spec:
1515
singular: addon
1616
scope: Namespaced
1717
versions:
18-
- name: v1alpha1
18+
- additionalPrinterColumns:
19+
- jsonPath: .spec.clusterName
20+
name: CLUSTER
21+
type: string
22+
- jsonPath: .spec.addonVersion
23+
name: ADDONVERSION
24+
type: string
25+
- jsonPath: .spec.resolveConflicts
26+
name: RESOLVECONFLICTS
27+
type: string
28+
- jsonPath: .status.status
29+
name: STATUS
30+
priority: 1
31+
type: string
32+
- jsonPath: .spec.serviceAccountRoleARN
33+
name: SERVICEACCOUNTROLEARN
34+
priority: 1
35+
type: string
36+
- jsonPath: .status.conditions[?(@.type=="ACK.ResourceSynced")].status
37+
name: Synced
38+
type: string
39+
- jsonPath: .metadata.creationTimestamp
40+
name: Age
41+
type: date
42+
name: v1alpha1
1943
schema:
2044
openAPIV3Schema:
2145
description: Addon is the Schema for the Addons API

0 commit comments

Comments
 (0)