Skip to content

Commit df958ed

Browse files
authored
Merge pull request #749 from Huang-Wei/bump-controller-gen
bump codegen to 0.14.0
2 parents 004e0d9 + 7ee1844 commit df958ed

File tree

11 files changed

+373
-92
lines changed

11 files changed

+373
-92
lines changed

apis/scheduling/v1alpha1/zz_generated.deepcopy.go

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

config/crd/bases/scheduling.x-k8s.io_elasticquotas.yaml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/52
7-
controller-gen.kubebuilder.io/version: v0.11.1
8-
creationTimestamp: null
7+
controller-gen.kubebuilder.io/version: v0.14.0
98
name: elasticquotas.scheduling.x-k8s.io
109
spec:
1110
group: scheduling.x-k8s.io
@@ -39,14 +38,19 @@ spec:
3938
description: ElasticQuota sets elastic quota restrictions per namespace
4039
properties:
4140
apiVersion:
42-
description: 'APIVersion defines the versioned schema of this representation
43-
of an object. Servers should convert recognized schemas to the latest
44-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
41+
description: |-
42+
APIVersion defines the versioned schema of this representation of an object.
43+
Servers should convert recognized schemas to the latest internal value, and
44+
may reject unrecognized values.
45+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4546
type: string
4647
kind:
47-
description: 'Kind is a string value representing the REST resource this
48-
object represents. Servers may infer this from the endpoint the client
49-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
48+
description: |-
49+
Kind is a string value representing the REST resource this object represents.
50+
Servers may infer this from the endpoint the client submits requests to.
51+
Cannot be updated.
52+
In CamelCase.
53+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
5054
type: string
5155
metadata:
5256
type: object
@@ -60,9 +64,9 @@ spec:
6064
- type: string
6165
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
6266
x-kubernetes-int-or-string: true
63-
description: Max is the set of desired max limits for each named resource.
64-
The usage of max is based on the resource configurations of successfully
65-
scheduled pods.
67+
description: |-
68+
Max is the set of desired max limits for each named resource. The usage of max is based on the resource configurations of
69+
successfully scheduled pods.
6670
type: object
6771
min:
6872
additionalProperties:

config/crd/bases/scheduling.x-k8s.io_podgroups.yaml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/50
7-
controller-gen.kubebuilder.io/version: v0.11.1
8-
creationTimestamp: null
7+
controller-gen.kubebuilder.io/version: v0.14.0
98
name: podgroups.scheduling.x-k8s.io
109
spec:
1110
group: scheduling.x-k8s.io
@@ -51,24 +50,30 @@ spec:
5150
description: PodGroup is a collection of Pod; used for batch workload.
5251
properties:
5352
apiVersion:
54-
description: 'APIVersion defines the versioned schema of this representation
55-
of an object. Servers should convert recognized schemas to the latest
56-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
53+
description: |-
54+
APIVersion defines the versioned schema of this representation of an object.
55+
Servers should convert recognized schemas to the latest internal value, and
56+
may reject unrecognized values.
57+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
5758
type: string
5859
kind:
59-
description: 'Kind is a string value representing the REST resource this
60-
object represents. Servers may infer this from the endpoint the client
61-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
60+
description: |-
61+
Kind is a string value representing the REST resource this object represents.
62+
Servers may infer this from the endpoint the client submits requests to.
63+
Cannot be updated.
64+
In CamelCase.
65+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
6266
type: string
6367
metadata:
6468
type: object
6569
spec:
6670
description: Specification of the desired behavior of the pod group.
6771
properties:
6872
minMember:
69-
description: MinMember defines the minimal number of members/tasks
70-
to run the pod group; if there's not enough resources to start all
71-
tasks, the scheduler will not start any.
73+
description: |-
74+
MinMember defines the minimal number of members/tasks to run the pod group;
75+
if there's not enough resources to start all tasks, the scheduler
76+
will not start any.
7277
format: int32
7378
type: integer
7479
minResources:
@@ -78,9 +83,10 @@ spec:
7883
- type: string
7984
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
8085
x-kubernetes-int-or-string: true
81-
description: MinResources defines the minimal resource of members/tasks
82-
to run the pod group; if there's not enough resources to start all
83-
tasks, the scheduler will not start any.
86+
description: |-
87+
MinResources defines the minimal resource of members/tasks to run the pod group;
88+
if there's not enough resources to start all tasks, the scheduler
89+
will not start any.
8490
type: object
8591
scheduleTimeoutSeconds:
8692
description: ScheduleTimeoutSeconds defines the maximal time of members/tasks
@@ -89,16 +95,18 @@ spec:
8995
type: integer
9096
type: object
9197
status:
92-
description: Status represents the current information about a pod group.
98+
description: |-
99+
Status represents the current information about a pod group.
93100
This data may not be up to date.
94101
properties:
95102
failed:
96103
description: The number of pods which reached phase Failed.
97104
format: int32
98105
type: integer
99106
occupiedBy:
100-
description: OccupiedBy marks the workload (e.g., deployment, statefulset)
101-
UID that occupy the podgroup. It is empty if not initialized.
107+
description: |-
108+
OccupiedBy marks the workload (e.g., deployment, statefulset) UID that occupy the podgroup.
109+
It is empty if not initialized.
102110
type: string
103111
phase:
104112
description: Current phase of PodGroup.

hack/update-codegen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[@]}")/..
2323
TOOLS_DIR=$(realpath ./hack/tools)
2424
TOOLS_BIN_DIR="${TOOLS_DIR}/bin"
2525
GO_INSTALL=$(realpath ./hack/go-install.sh)
26-
CONTROLLER_GEN_VER=v0.11.1
26+
CONTROLLER_GEN_VER=v0.14.0
2727
CONTROLLER_GEN_BIN=controller-gen
2828
CONTROLLER_GEN=${TOOLS_BIN_DIR}/${CONTROLLER_GEN_BIN}-${CONTROLLER_GEN_VER}
2929
# Need v1 to support defaults in CRDs, unfortunately limiting us to k8s 1.16+

hack/verify-crdgen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ CRD_OPTIONS="crd"
2727

2828
# Download controller-gen locally
2929
CONTROLLER_GEN="${GOPATH}/bin/controller-gen"
30-
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.1
30+
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
3131

3232
# Generate CRD
3333
api_paths="./apis/scheduling/v1alpha1/...;./vendor/github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/...;./vendor/github.com/diktyo-io/appgroup-api/pkg/apis/...;./vendor/github.com/diktyo-io/networktopology-api/pkg/apis/...;./vendor/sigs.k8s.io/security-profiles-operator/api/seccompprofile/v1beta1/..."

manifests/appgroup/crd.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: appgroups.appgroup.diktyo.x-k8s.io
98
spec:
109
group: appgroup.diktyo.x-k8s.io
@@ -23,14 +22,19 @@ spec:
2322
description: AppGroup is a collection of Pods belonging to the same application.
2423
properties:
2524
apiVersion:
26-
description: 'APIVersion defines the versioned schema of this representation
27-
of an object. Servers should convert recognized schemas to the latest
28-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
25+
description: |-
26+
APIVersion defines the versioned schema of this representation of an object.
27+
Servers should convert recognized schemas to the latest internal value, and
28+
may reject unrecognized values.
29+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2930
type: string
3031
kind:
31-
description: 'Kind is a string value representing the REST resource this
32-
object represents. Servers may infer this from the endpoint the client
33-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
32+
description: |-
33+
Kind is a string value representing the REST resource this object represents.
34+
Servers may infer this from the endpoint the client submits requests to.
35+
Cannot be updated.
36+
In CamelCase.
37+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3438
type: string
3539
metadata:
3640
type: object

manifests/capacityscheduling/crd.yaml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/52
7-
controller-gen.kubebuilder.io/version: v0.11.1
8-
creationTimestamp: null
7+
controller-gen.kubebuilder.io/version: v0.14.0
98
name: elasticquotas.scheduling.x-k8s.io
109
spec:
1110
group: scheduling.x-k8s.io
@@ -39,14 +38,19 @@ spec:
3938
description: ElasticQuota sets elastic quota restrictions per namespace
4039
properties:
4140
apiVersion:
42-
description: 'APIVersion defines the versioned schema of this representation
43-
of an object. Servers should convert recognized schemas to the latest
44-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
41+
description: |-
42+
APIVersion defines the versioned schema of this representation of an object.
43+
Servers should convert recognized schemas to the latest internal value, and
44+
may reject unrecognized values.
45+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4546
type: string
4647
kind:
47-
description: 'Kind is a string value representing the REST resource this
48-
object represents. Servers may infer this from the endpoint the client
49-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
48+
description: |-
49+
Kind is a string value representing the REST resource this object represents.
50+
Servers may infer this from the endpoint the client submits requests to.
51+
Cannot be updated.
52+
In CamelCase.
53+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
5054
type: string
5155
metadata:
5256
type: object
@@ -60,9 +64,9 @@ spec:
6064
- type: string
6165
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
6266
x-kubernetes-int-or-string: true
63-
description: Max is the set of desired max limits for each named resource.
64-
The usage of max is based on the resource configurations of successfully
65-
scheduled pods.
67+
description: |-
68+
Max is the set of desired max limits for each named resource. The usage of max is based on the resource configurations of
69+
successfully scheduled pods.
6670
type: object
6771
min:
6872
additionalProperties:

manifests/coscheduling/crd.yaml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/50
7-
controller-gen.kubebuilder.io/version: v0.11.1
8-
creationTimestamp: null
7+
controller-gen.kubebuilder.io/version: v0.14.0
98
name: podgroups.scheduling.x-k8s.io
109
spec:
1110
group: scheduling.x-k8s.io
@@ -51,24 +50,30 @@ spec:
5150
description: PodGroup is a collection of Pod; used for batch workload.
5251
properties:
5352
apiVersion:
54-
description: 'APIVersion defines the versioned schema of this representation
55-
of an object. Servers should convert recognized schemas to the latest
56-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
53+
description: |-
54+
APIVersion defines the versioned schema of this representation of an object.
55+
Servers should convert recognized schemas to the latest internal value, and
56+
may reject unrecognized values.
57+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
5758
type: string
5859
kind:
59-
description: 'Kind is a string value representing the REST resource this
60-
object represents. Servers may infer this from the endpoint the client
61-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
60+
description: |-
61+
Kind is a string value representing the REST resource this object represents.
62+
Servers may infer this from the endpoint the client submits requests to.
63+
Cannot be updated.
64+
In CamelCase.
65+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
6266
type: string
6367
metadata:
6468
type: object
6569
spec:
6670
description: Specification of the desired behavior of the pod group.
6771
properties:
6872
minMember:
69-
description: MinMember defines the minimal number of members/tasks
70-
to run the pod group; if there's not enough resources to start all
71-
tasks, the scheduler will not start any.
73+
description: |-
74+
MinMember defines the minimal number of members/tasks to run the pod group;
75+
if there's not enough resources to start all tasks, the scheduler
76+
will not start any.
7277
format: int32
7378
type: integer
7479
minResources:
@@ -78,9 +83,10 @@ spec:
7883
- type: string
7984
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
8085
x-kubernetes-int-or-string: true
81-
description: MinResources defines the minimal resource of members/tasks
82-
to run the pod group; if there's not enough resources to start all
83-
tasks, the scheduler will not start any.
86+
description: |-
87+
MinResources defines the minimal resource of members/tasks to run the pod group;
88+
if there's not enough resources to start all tasks, the scheduler
89+
will not start any.
8490
type: object
8591
scheduleTimeoutSeconds:
8692
description: ScheduleTimeoutSeconds defines the maximal time of members/tasks
@@ -89,16 +95,18 @@ spec:
8995
type: integer
9096
type: object
9197
status:
92-
description: Status represents the current information about a pod group.
98+
description: |-
99+
Status represents the current information about a pod group.
93100
This data may not be up to date.
94101
properties:
95102
failed:
96103
description: The number of pods which reached phase Failed.
97104
format: int32
98105
type: integer
99106
occupiedBy:
100-
description: OccupiedBy marks the workload (e.g., deployment, statefulset)
101-
UID that occupy the podgroup. It is empty if not initialized.
107+
description: |-
108+
OccupiedBy marks the workload (e.g., deployment, statefulset) UID that occupy the podgroup.
109+
It is empty if not initialized.
102110
type: string
103111
phase:
104112
description: Current phase of PodGroup.

0 commit comments

Comments
 (0)