Skip to content

Commit 14af38d

Browse files
mythimythi
committed
operator: update to controller-gen v0.14 and generate CRDs with it
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
1 parent 0099434 commit 14af38d

12 files changed

+402
-285
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ BUILDER ?= "docker"
99
EXTRA_BUILD_ARGS ?= ""
1010

1111
CERT_MANAGER_VERSION ?= v1.14.2
12-
CONTROLLER_GEN_VERSION ?= v0.13.0
12+
CONTROLLER_GEN_VERSION ?= v0.14.0
1313
GOLANGCI_LINT_VERSION ?= v1.55.2
1414
KIND_VERSION ?= v0.21.0
1515
GOLICENSES_VERSION ?= v1.6.0

‎deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_acceleratorfunctions.yaml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: acceleratorfunctions.fpga.intel.com
88
spec:
99
group: fpga.intel.com
@@ -19,18 +19,24 @@ spec:
1919
- name: v2
2020
schema:
2121
openAPIV3Schema:
22-
description: AcceleratorFunction is a specification for an Accelerator Function
23-
resource provided by a FPGA-based programmable hardware accelerator.
22+
description: |-
23+
AcceleratorFunction is a specification for an Accelerator Function resource
24+
provided by a FPGA-based programmable hardware accelerator.
2425
properties:
2526
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'
27+
description: |-
28+
APIVersion defines the versioned schema of this representation of an object.
29+
Servers should convert recognized schemas to the latest internal value, and
30+
may reject unrecognized values.
31+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2932
type: string
3033
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'
34+
description: |-
35+
Kind is a string value representing the REST resource this object represents.
36+
Servers may infer this from the endpoint the client submits requests to.
37+
Cannot be updated.
38+
In CamelCase.
39+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3440
type: string
3541
metadata:
3642
type: object

‎deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_fpgaregions.yaml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: fpgaregions.fpga.intel.com
88
spec:
99
group: fpga.intel.com
@@ -19,18 +19,24 @@ spec:
1919
- name: v2
2020
schema:
2121
openAPIV3Schema:
22-
description: FpgaRegion is a specification for a FPGA region resource which
23-
can be programmed with a bitstream.
22+
description: |-
23+
FpgaRegion is a specification for a FPGA region resource which can be programmed
24+
with a bitstream.
2425
properties:
2526
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'
27+
description: |-
28+
APIVersion defines the versioned schema of this representation of an object.
29+
Servers should convert recognized schemas to the latest internal value, and
30+
may reject unrecognized values.
31+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2932
type: string
3033
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'
34+
description: |-
35+
Kind is a string value representing the REST resource this object represents.
36+
Servers may infer this from the endpoint the client submits requests to.
37+
Cannot be updated.
38+
In CamelCase.
39+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3440
type: string
3541
metadata:
3642
type: object

‎deployments/operator/crd/bases/deviceplugin.intel.com_dlbdeviceplugins.yaml‎

Lines changed: 46 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: dlbdeviceplugins.deviceplugin.intel.com
88
spec:
99
group: deviceplugin.intel.com
@@ -30,19 +30,25 @@ spec:
3030
name: v1
3131
schema:
3232
openAPIV3Schema:
33-
description: DlbDevicePlugin is the Schema for the dlbdeviceplugins API. It
34-
represents the DLB device plugin responsible for advertising Intel DLB hardware
35-
resources to the kubelet.
33+
description: |-
34+
DlbDevicePlugin is the Schema for the dlbdeviceplugins API. It represents
35+
the DLB device plugin responsible for advertising Intel DLB hardware resources to
36+
the kubelet.
3637
properties:
3738
apiVersion:
38-
description: 'APIVersion defines the versioned schema of this representation
39-
of an object. Servers should convert recognized schemas to the latest
40-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
39+
description: |-
40+
APIVersion defines the versioned schema of this representation of an object.
41+
Servers should convert recognized schemas to the latest internal value, and
42+
may reject unrecognized values.
43+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4144
type: string
4245
kind:
43-
description: 'Kind is a string value representing the REST resource this
44-
object represents. Servers may infer this from the endpoint the client
45-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
46+
description: |-
47+
Kind is a string value representing the REST resource this object represents.
48+
Servers may infer this from the endpoint the client submits requests to.
49+
Cannot be updated.
50+
In CamelCase.
51+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4652
type: string
4753
metadata:
4854
type: object
@@ -78,40 +84,47 @@ spec:
7884
description: API version of the referent.
7985
type: string
8086
fieldPath:
81-
description: 'If referring to a piece of an object instead of
82-
an entire object, this string should contain a valid JSON/Go
83-
field access statement, such as desiredState.manifest.containers[2].
84-
For example, if the object reference is to a container within
85-
a pod, this would take on a value like: "spec.containers{name}"
86-
(where "name" refers to the name of the container that triggered
87-
the event) or if no container name is specified "spec.containers[2]"
88-
(container with index 2 in this pod). This syntax is chosen
89-
only to have some well-defined way of referencing a part of
90-
an object. TODO: this design is not final and this field is
91-
subject to change in the future.'
87+
description: |-
88+
If referring to a piece of an object instead of an entire object, this string
89+
should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
90+
For example, if the object reference is to a container within a pod, this would take on a value like:
91+
"spec.containers{name}" (where "name" refers to the name of the container that triggered
92+
the event) or if no container name is specified "spec.containers[2]" (container with
93+
index 2 in this pod). This syntax is chosen only to have some well-defined way of
94+
referencing a part of an object.
95+
TODO: this design is not final and this field is subject to change in the future.
9296
type: string
9397
kind:
94-
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
98+
description: |-
99+
Kind of the referent.
100+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
95101
type: string
96102
name:
97-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
103+
description: |-
104+
Name of the referent.
105+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
98106
type: string
99107
namespace:
100-
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
108+
description: |-
109+
Namespace of the referent.
110+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
101111
type: string
102112
resourceVersion:
103-
description: 'Specific resourceVersion to which this reference
104-
is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
113+
description: |-
114+
Specific resourceVersion to which this reference is made, if any.
115+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
105116
type: string
106117
uid:
107-
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
118+
description: |-
119+
UID of the referent.
120+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
108121
type: string
109122
type: object
110123
x-kubernetes-map-type: atomic
111124
desiredNumberScheduled:
112-
description: The total number of nodes that should be running the
113-
device plugin pod (including nodes correctly running the device
114-
plugin pod).
125+
description: |-
126+
The total number of nodes that should be running the device plugin
127+
pod (including nodes correctly running the device plugin pod).
115128
format: int32
116129
type: integer
117130
nodeNames:
@@ -121,9 +134,9 @@ spec:
121134
type: string
122135
type: array
123136
numberReady:
124-
description: The number of nodes that should be running the device
125-
plugin pod and have one or more of the device plugin pod running
126-
and ready.
137+
description: |-
138+
The number of nodes that should be running the device plugin pod and have one
139+
or more of the device plugin pod running and ready.
127140
format: int32
128141
type: integer
129142
required:

0 commit comments

Comments
 (0)