Skip to content

Commit e096125

Browse files
authored
Using controller-gen latest version for CRD generation (gardener#640)
* using controller-gen latest version for CRD generation * v1 CRDs
1 parent 6b9d5b4 commit e096125

12 files changed

+3101
-2473
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ ifeq (, $(shell which controller-gen))
146146
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
147147
cd $$CONTROLLER_GEN_TMP_DIR ;\
148148
go mod init tmp ;\
149-
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
149+
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2 ;\
150150
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
151151
}
152152
CONTROLLER_GEN=$(GOBIN)/controller-gen

kubernetes/crds/machine.sapcloud.io_alicloudmachineclasses.yaml

Lines changed: 124 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -4,156 +4,155 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.3.0
7+
controller-gen.kubebuilder.io/version: v0.6.2
88
creationTimestamp: null
99
name: alicloudmachineclasses.machine.sapcloud.io
1010
spec:
11-
additionalPrinterColumns:
12-
- JSONPath: .spec.instanceType
13-
name: Instance Type
14-
type: string
15-
- JSONPath: .spec.region
16-
name: Region
17-
priority: 1
18-
type: string
19-
- JSONPath: .metadata.creationTimestamp
20-
description: |-
21-
CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
22-
Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
23-
name: Age
24-
type: date
2511
group: machine.sapcloud.io
2612
names:
2713
kind: AlicloudMachineClass
2814
listKind: AlicloudMachineClassList
2915
plural: alicloudmachineclasses
3016
singular: alicloudmachineclass
3117
scope: Namespaced
32-
subresources: {}
33-
validation:
34-
openAPIV3Schema:
35-
description: AlicloudMachineClass TODO
36-
properties:
37-
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'
41-
type: string
42-
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-
type: string
47-
metadata:
48-
type: object
49-
spec:
50-
description: AlicloudMachineClassSpec is the specification of a AlicloudMachineClass.
51-
properties:
52-
IoOptimized:
53-
type: string
54-
credentialsSecretRef:
55-
description: SecretReference represents a Secret Reference. It has enough
56-
information to retrieve secret in any namespace
57-
properties:
58-
name:
59-
description: Name is unique within a namespace to reference a secret
60-
resource.
61-
type: string
62-
namespace:
63-
description: Namespace defines the space within which the secret
64-
name must be unique.
65-
type: string
66-
type: object
67-
dataDisks:
68-
items:
18+
versions:
19+
- additionalPrinterColumns:
20+
- jsonPath: .spec.instanceType
21+
name: Instance Type
22+
type: string
23+
- jsonPath: .spec.region
24+
name: Region
25+
priority: 1
26+
type: string
27+
- description: |-
28+
CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
29+
Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
30+
jsonPath: .metadata.creationTimestamp
31+
name: Age
32+
type: date
33+
name: v1alpha1
34+
schema:
35+
openAPIV3Schema:
36+
description: AlicloudMachineClass TODO
37+
properties:
38+
apiVersion:
39+
description: 'APIVersion defines the versioned schema of this representation
40+
of an object. Servers should convert recognized schemas to the latest
41+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
42+
type: string
43+
kind:
44+
description: 'Kind is a string value representing the REST resource this
45+
object represents. Servers may infer this from the endpoint the client
46+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
47+
type: string
48+
metadata:
49+
type: object
50+
spec:
51+
description: AlicloudMachineClassSpec is the specification of a AlicloudMachineClass.
52+
properties:
53+
IoOptimized:
54+
type: string
55+
credentialsSecretRef:
56+
description: SecretReference represents a Secret Reference. It has
57+
enough information to retrieve secret in any namespace
6958
properties:
70-
category:
59+
name:
60+
description: Name is unique within a namespace to reference a
61+
secret resource.
7162
type: string
72-
deleteWithInstance:
73-
type: boolean
74-
description:
63+
namespace:
64+
description: Namespace defines the space within which the secret
65+
name must be unique.
7566
type: string
76-
encrypted:
77-
type: boolean
67+
type: object
68+
dataDisks:
69+
items:
70+
properties:
71+
category:
72+
type: string
73+
deleteWithInstance:
74+
type: boolean
75+
description:
76+
type: string
77+
encrypted:
78+
type: boolean
79+
name:
80+
type: string
81+
size:
82+
type: integer
83+
required:
84+
- category
85+
- deleteWithInstance
86+
- encrypted
87+
- name
88+
- size
89+
type: object
90+
type: array
91+
imageID:
92+
type: string
93+
instanceChargeType:
94+
type: string
95+
instanceType:
96+
type: string
97+
internetChargeType:
98+
type: string
99+
internetMaxBandwidthIn:
100+
type: integer
101+
internetMaxBandwidthOut:
102+
type: integer
103+
keyPairName:
104+
type: string
105+
privateIPAddress:
106+
type: string
107+
region:
108+
type: string
109+
secretRef:
110+
description: SecretReference represents a Secret Reference. It has
111+
enough information to retrieve secret in any namespace
112+
properties:
78113
name:
114+
description: Name is unique within a namespace to reference a
115+
secret resource.
116+
type: string
117+
namespace:
118+
description: Namespace defines the space within which the secret
119+
name must be unique.
120+
type: string
121+
type: object
122+
securityGroupID:
123+
type: string
124+
spotStrategy:
125+
type: string
126+
systemDisk:
127+
description: AlicloudSystemDisk describes SystemDisk for Alicloud.
128+
properties:
129+
category:
79130
type: string
80131
size:
81132
type: integer
82133
required:
83134
- category
84-
- deleteWithInstance
85-
- encrypted
86-
- name
87135
- size
88136
type: object
89-
type: array
90-
imageID:
91-
type: string
92-
instanceChargeType:
93-
type: string
94-
instanceType:
95-
type: string
96-
internetChargeType:
97-
type: string
98-
internetMaxBandwidthIn:
99-
type: integer
100-
internetMaxBandwidthOut:
101-
type: integer
102-
keyPairName:
103-
type: string
104-
privateIPAddress:
105-
type: string
106-
region:
107-
type: string
108-
secretRef:
109-
description: SecretReference represents a Secret Reference. It has enough
110-
information to retrieve secret in any namespace
111-
properties:
112-
name:
113-
description: Name is unique within a namespace to reference a secret
114-
resource.
115-
type: string
116-
namespace:
117-
description: Namespace defines the space within which the secret
118-
name must be unique.
119-
type: string
120-
type: object
121-
securityGroupID:
122-
type: string
123-
spotStrategy:
124-
type: string
125-
systemDisk:
126-
description: AlicloudSystemDisk describes SystemDisk for Alicloud.
127-
properties:
128-
category:
137+
tags:
138+
additionalProperties:
129139
type: string
130-
size:
131-
type: integer
132-
required:
133-
- category
134-
- size
135-
type: object
136-
tags:
137-
additionalProperties:
140+
type: object
141+
vSwitchID:
138142
type: string
139-
type: object
140-
vSwitchID:
141-
type: string
142-
zoneID:
143-
type: string
144-
required:
145-
- imageID
146-
- instanceType
147-
- keyPairName
148-
- region
149-
- vSwitchID
150-
type: object
151-
type: object
152-
version: v1alpha1
153-
versions:
154-
- name: v1alpha1
143+
zoneID:
144+
type: string
145+
required:
146+
- imageID
147+
- instanceType
148+
- keyPairName
149+
- region
150+
- vSwitchID
151+
type: object
152+
type: object
155153
served: true
156154
storage: true
155+
subresources: {}
157156
status:
158157
acceptedNames:
159158
kind: ""

0 commit comments

Comments
 (0)