Skip to content

Commit d220974

Browse files
1gtm1gtm
authored
Update for release [email protected] (#56)
ProductLine: ACE Release: v2025.9.15 Signed-off-by: 1gtm <[email protected]>
1 parent a4010d0 commit d220974

File tree

25 files changed

+505
-21
lines changed

25 files changed

+505
-21
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ require (
1414
k8s.io/apimachinery v0.32.3
1515
k8s.io/client-go v0.32.3
1616
k8s.io/klog/v2 v2.130.1
17-
kmodules.xyz/client-go v0.32.6
18-
kmodules.xyz/resource-metadata v0.32.0
17+
kmodules.xyz/client-go v0.32.7
18+
kmodules.xyz/resource-metadata v0.36.0
1919
sigs.k8s.io/controller-runtime v0.20.4
2020
)
2121

@@ -118,7 +118,7 @@ require (
118118
kmodules.xyz/apiversion v0.2.0 // indirect
119119
kmodules.xyz/go-containerregistry v0.0.14 // indirect
120120
kmodules.xyz/offshoot-api v0.32.0 // indirect
121-
kmodules.xyz/resource-metrics v0.30.9 // indirect
121+
kmodules.xyz/resource-metrics v0.30.11-0.20250808121819-d4255c017e68 // indirect
122122
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
123123
sigs.k8s.io/randfill v1.0.0 // indirect
124124
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -564,16 +564,16 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
564564
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
565565
kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
566566
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
567-
kmodules.xyz/client-go v0.32.6 h1:/V9T0aLfe38PsyF+5FeU5QaC3GcqD8hQoWSCZw/uOpI=
568-
kmodules.xyz/client-go v0.32.6/go.mod h1:ZwLnc7UqEXUNSe43n/SnER6+7YAQCu38L2te6YefoHU=
567+
kmodules.xyz/client-go v0.32.7 h1:vBAbp8vs4coYRhY4wqm1Hw/eBEDiVU238AyMLSoRJ1c=
568+
kmodules.xyz/client-go v0.32.7/go.mod h1:ZwLnc7UqEXUNSe43n/SnER6+7YAQCu38L2te6YefoHU=
569569
kmodules.xyz/go-containerregistry v0.0.14 h1:8MgLFa74HymAJEyjH7fyQJn5u2Ok6qPPFQX8ARfcXp0=
570570
kmodules.xyz/go-containerregistry v0.0.14/go.mod h1:xz0iGC3noyMi5NNAzXWTH6KqfiIgFWZAomw+U2zVOXs=
571571
kmodules.xyz/offshoot-api v0.32.0 h1:gogc5scSZe2JoXtZof72UGRl3Tit0kFaFRMkLLT1D8o=
572572
kmodules.xyz/offshoot-api v0.32.0/go.mod h1:tled7OxYZ3SkUJcrVFVVYyd+zXjsRSEm1R6Q3k4gcx0=
573-
kmodules.xyz/resource-metadata v0.32.0 h1:BabYnN+mlSC8ZEfCvHpXjKCRExmzaahrPIwdhRXqJW4=
574-
kmodules.xyz/resource-metadata v0.32.0/go.mod h1:wHC24BVzKb1gzkDCSI5l9CXK4AKD5gMamxEqVys50lI=
575-
kmodules.xyz/resource-metrics v0.30.9 h1:A25GC7+UpYAEJCVx44CxQYLE9vqDxC8R+suSNoWDEyY=
576-
kmodules.xyz/resource-metrics v0.30.9/go.mod h1:5K+0A0iU+4JBFPZEuj716/oSgI9xUTnVTANS+cwhHIs=
573+
kmodules.xyz/resource-metadata v0.36.0 h1:KDVSrq4XcOoyAB8NTdHCqYduGfCUwP3AivRxkFdATJA=
574+
kmodules.xyz/resource-metadata v0.36.0/go.mod h1:rwXNC2Byb0m0XJv9PxSxPJwMM6OdU+6uOidUCHu74zU=
575+
kmodules.xyz/resource-metrics v0.30.11-0.20250808121819-d4255c017e68 h1:Wzj3OzURb0qx/CeoFnA7U8xjBuPjW606txW83Rd1SZo=
576+
kmodules.xyz/resource-metrics v0.30.11-0.20250808121819-d4255c017e68/go.mod h1:5K+0A0iU+4JBFPZEuj716/oSgI9xUTnVTANS+cwhHIs=
577577
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
578578
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
579579
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=

‎vendor/kmodules.xyz/client-go/meta/lib.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
// ref: https://github.com/kubernetes-sigs/application/blob/4ead7f1b87048b7717b3e474a21fdc07e6bce636/pkg/controller/application/application_controller.go#L28
3232
const (
3333
NameLabelKey = "app.kubernetes.io/name"
34+
NamespaceLabelKey = "app.kubernetes.io/namespace"
3435
VersionLabelKey = "app.kubernetes.io/version"
3536
InstanceLabelKey = "app.kubernetes.io/instance"
3637
PartOfLabelKey = "app.kubernetes.io/part-of"

‎vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go‎

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

‎vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/resourcelayout_types.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,23 @@ type FeatureList []string
9191

9292
type PageBlockTableDefinition struct {
9393
Columns []ResourceColumnDefinition `json:"columns,omitempty"`
94+
Sort *TableSortOption `json:"sort,omitempty"`
9495
}
9596

97+
type TableSortOption struct {
98+
Order TableSortOrder `json:"order,omitempty"`
99+
FieldName string `json:"fieldName,omitempty"`
100+
}
101+
102+
// +kubebuilder:validation:Enum=Ascending;Descending
103+
104+
type TableSortOrder string
105+
106+
const (
107+
TableSortOrderAscending TableSortOrder = "Ascending"
108+
TableSortOrderDescending TableSortOrder = "Descending"
109+
)
110+
96111
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
97112
// +kubebuilder:object:root=true
98113

‎vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/resourceoutline_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ type PageBlockOutline struct {
9898
type ResourceTableDefinitionRef struct {
9999
Name string `json:"name,omitempty"`
100100
Columns []ResourceColumnDefinition `json:"columns,omitempty"`
101+
Sort *TableSortOption `json:"sort,omitempty"`
101102
}
102103

103104
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

‎vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/zz_generated.deepcopy.go‎

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

‎vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourceblockdefinitions.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,16 @@ spec:
263263
type: array
264264
name:
265265
type: string
266+
sort:
267+
properties:
268+
fieldName:
269+
type: string
270+
order:
271+
enum:
272+
- Ascending
273+
- Descending
274+
type: string
275+
type: object
266276
type: object
267277
width:
268278
type: integer

‎vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourcelayouts.yaml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,16 @@ spec:
265265
- type
266266
type: object
267267
type: array
268+
sort:
269+
properties:
270+
fieldName:
271+
type: string
272+
order:
273+
enum:
274+
- Ascending
275+
- Descending
276+
type: string
277+
type: object
268278
type: object
269279
width:
270280
type: integer
@@ -515,6 +525,16 @@ spec:
515525
- type
516526
type: object
517527
type: array
528+
sort:
529+
properties:
530+
fieldName:
531+
type: string
532+
order:
533+
enum:
534+
- Ascending
535+
- Descending
536+
type: string
537+
type: object
518538
type: object
519539
width:
520540
type: integer
@@ -773,6 +793,16 @@ spec:
773793
- type
774794
type: object
775795
type: array
796+
sort:
797+
properties:
798+
fieldName:
799+
type: string
800+
order:
801+
enum:
802+
- Ascending
803+
- Descending
804+
type: string
805+
type: object
776806
type: object
777807
width:
778808
type: integer
@@ -1008,6 +1038,16 @@ spec:
10081038
- type
10091039
type: object
10101040
type: array
1041+
sort:
1042+
properties:
1043+
fieldName:
1044+
type: string
1045+
order:
1046+
enum:
1047+
- Ascending
1048+
- Descending
1049+
type: string
1050+
type: object
10111051
type: object
10121052
width:
10131053
type: integer
@@ -1279,6 +1319,16 @@ spec:
12791319
- type
12801320
type: object
12811321
type: array
1322+
sort:
1323+
properties:
1324+
fieldName:
1325+
type: string
1326+
order:
1327+
enum:
1328+
- Ascending
1329+
- Descending
1330+
type: string
1331+
type: object
12821332
type: object
12831333
width:
12841334
type: integer

‎vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourceoutlines.yaml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,16 @@ spec:
351351
type: array
352352
name:
353353
type: string
354+
sort:
355+
properties:
356+
fieldName:
357+
type: string
358+
order:
359+
enum:
360+
- Ascending
361+
- Descending
362+
type: string
363+
type: object
354364
type: object
355365
width:
356366
type: integer
@@ -599,6 +609,16 @@ spec:
599609
type: array
600610
name:
601611
type: string
612+
sort:
613+
properties:
614+
fieldName:
615+
type: string
616+
order:
617+
enum:
618+
- Ascending
619+
- Descending
620+
type: string
621+
type: object
602622
type: object
603623
width:
604624
type: integer
@@ -855,6 +875,16 @@ spec:
855875
type: array
856876
name:
857877
type: string
878+
sort:
879+
properties:
880+
fieldName:
881+
type: string
882+
order:
883+
enum:
884+
- Ascending
885+
- Descending
886+
type: string
887+
type: object
858888
type: object
859889
width:
860890
type: integer
@@ -1088,6 +1118,16 @@ spec:
10881118
type: array
10891119
name:
10901120
type: string
1121+
sort:
1122+
properties:
1123+
fieldName:
1124+
type: string
1125+
order:
1126+
enum:
1127+
- Ascending
1128+
- Descending
1129+
type: string
1130+
type: object
10911131
type: object
10921132
width:
10931133
type: integer
@@ -1357,6 +1397,16 @@ spec:
13571397
type: array
13581398
name:
13591399
type: string
1400+
sort:
1401+
properties:
1402+
fieldName:
1403+
type: string
1404+
order:
1405+
enum:
1406+
- Ascending
1407+
- Descending
1408+
type: string
1409+
type: object
13601410
type: object
13611411
width:
13621412
type: integer

0 commit comments

Comments
 (0)