Skip to content

Commit 8b7945e

Browse files
Commit from GitHub Actions (Scheduled Jobs)
1 parent 86d5a2c commit 8b7945e

28 files changed

Lines changed: 163 additions & 277 deletions

definitions/infrastructure.cluster.x-k8s.io/ibmpowervscluster.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
88
cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
99
name: ibmpowervsclusters.infrastructure.cluster.x-k8s.io
@@ -88,6 +88,9 @@ spec:
8888
description: port is the port on which the API server is serving.
8989
format: int32
9090
type: integer
91+
required:
92+
- host
93+
- port
9194
type: object
9295
network:
9396
description: Network is the reference to the Network to use for this
@@ -193,6 +196,9 @@ spec:
193196
description: port is the port on which the API server is serving.
194197
format: int32
195198
type: integer
199+
required:
200+
- host
201+
- port
196202
type: object
197203
cosInstance:
198204
description: |-
@@ -589,9 +595,8 @@ spec:
589595
type: object
590596
serviceInstanceID:
591597
description: |-
592-
Deprecated: use ServiceInstance instead
593-
594598
ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
599+
Deprecated: use ServiceInstance instead
595600
type: string
596601
transitGateway:
597602
description: |-

definitions/infrastructure.cluster.x-k8s.io/ibmpowervsclustertemplate.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.19.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
labels:
77
cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
88
name: ibmpowervsclustertemplates.infrastructure.cluster.x-k8s.io
@@ -97,6 +97,9 @@ spec:
9797
is serving.
9898
format: int32
9999
type: integer
100+
required:
101+
- host
102+
- port
100103
type: object
101104
network:
102105
description: Network is the reference to the Network to use
@@ -214,6 +217,9 @@ spec:
214217
is serving.
215218
format: int32
216219
type: integer
220+
required:
221+
- host
222+
- port
217223
type: object
218224
cosInstance:
219225
description: |-
@@ -614,9 +620,8 @@ spec:
614620
type: object
615621
serviceInstanceID:
616622
description: |-
617-
Deprecated: use ServiceInstance instead
618-
619623
ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
624+
Deprecated: use ServiceInstance instead
620625
type: string
621626
transitGateway:
622627
description: |-

definitions/infrastructure.cluster.x-k8s.io/ibmpowervsimage.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
88
cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
99
name: ibmpowervsimages.infrastructure.cluster.x-k8s.io
@@ -260,9 +260,8 @@ spec:
260260
type: object
261261
serviceInstanceID:
262262
description: |-
263-
Deprecated: use ServiceInstance instead
264-
265263
ServiceInstanceID is the id of the power cloud instance where the image will get imported.
264+
Deprecated: use ServiceInstance instead
266265
type: string
267266
storageType:
268267
default: tier1

definitions/infrastructure.cluster.x-k8s.io/ibmpowervsmachine.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
88
cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
99
name: ibmpowervsmachines.infrastructure.cluster.x-k8s.io
@@ -499,9 +499,8 @@ spec:
499499
type: object
500500
serviceInstanceID:
501501
description: |-
502-
Deprecated: use ServiceInstance instead
503-
504502
ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
503+
Deprecated: use ServiceInstance instead
505504
type: string
506505
sshKey:
507506
description: SSHKey is the name of the SSH key pair provided to the

definitions/infrastructure.cluster.x-k8s.io/ibmpowervsmachinetemplate.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
88
cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
99
name: ibmpowervsmachinetemplates.infrastructure.cluster.x-k8s.io
@@ -339,9 +339,8 @@ spec:
339339
type: object
340340
serviceInstanceID:
341341
description: |-
342-
Deprecated: use ServiceInstance instead
343-
344342
ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
343+
Deprecated: use ServiceInstance instead
345344
type: string
346345
sshKey:
347346
description: SSHKey is the name of the SSH key pair provided

definitions/infrastructure.cluster.x-k8s.io/ibmvpccluster.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
88
cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
99
name: ibmvpcclusters.infrastructure.cluster.x-k8s.io
@@ -76,6 +76,9 @@ spec:
7676
description: port is the port on which the API server is serving.
7777
format: int32
7878
type: integer
79+
required:
80+
- host
81+
- port
7982
type: object
8083
controlPlaneLoadBalancer:
8184
description: ControlPlaneLoadBalancer is optional configuration for
@@ -263,6 +266,9 @@ spec:
263266
description: port is the port on which the API server is serving.
264267
format: int32
265268
type: integer
269+
required:
270+
- host
271+
- port
266272
type: object
267273
controlPlaneLoadBalancer:
268274
description: |-

definitions/infrastructure.cluster.x-k8s.io/ibmvpcclustertemplate.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.19.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
labels:
77
cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
88
name: ibmvpcclustertemplates.infrastructure.cluster.x-k8s.io
@@ -95,6 +95,9 @@ spec:
9595
is serving.
9696
format: int32
9797
type: integer
98+
required:
99+
- host
100+
- port
98101
type: object
99102
controlPlaneLoadBalancer:
100103
description: |-

definitions/infrastructure.cluster.x-k8s.io/ibmvpcmachine.yaml

Lines changed: 3 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
88
cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
99
name: ibmvpcmachines.infrastructure.cluster.x-k8s.io
@@ -220,65 +220,6 @@ spec:
220220
spec:
221221
description: IBMVPCMachineSpec defines the desired state of IBMVPCMachine.
222222
properties:
223-
additionalVolumes:
224-
description: |-
225-
additionalVolumes is the list of additional volumes attached to the instance
226-
There is a hard limit of 12 volume attachments per instance:
227-
https://cloud.ibm.com/docs/vpc?topic=vpc-attaching-block-storage&interface=api#vol-attach-limits
228-
items:
229-
description: VPCVolume defines the volume information.
230-
properties:
231-
deleteVolumeOnInstanceDelete:
232-
default: true
233-
description: |-
234-
DeleteVolumeOnInstanceDelete If set to true, when deleting the instance the volume will also be deleted.
235-
Default is set as true
236-
type: boolean
237-
encryptionKeyCRN:
238-
description: |-
239-
EncryptionKey is the root key to use to wrap the data encryption key for the volume and this points to the CRN
240-
and possible values are as follows.
241-
The CRN of the [Key Protect Root
242-
Key](https://cloud.ibm.com/docs/key-protect?topic=key-protect-getting-started-tutorial) or [Hyper Protect Crypto
243-
Service Root Key](https://cloud.ibm.com/docs/hs-crypto?topic=hs-crypto-get-started) for this resource.
244-
If unspecified, the `encryption` type for the volume will be `provider_managed`.
245-
type: string
246-
iops:
247-
description: |-
248-
Iops is the maximum I/O operations per second (IOPS) to use for the volume. Applicable only to volumes using a profile
249-
family of `custom`.
250-
format: int64
251-
type: integer
252-
name:
253-
description: |-
254-
Name is the unique user-defined name for this volume.
255-
Default will be autogenerated
256-
type: string
257-
profile:
258-
default: general-purpose
259-
description: |-
260-
Profile is the volume profile for the disk, refer https://cloud.ibm.com/docs/vpc?topic=vpc-block-storage-profiles
261-
for more information.
262-
Default to general-purpose
263-
NOTE: If a profile other than custom is specified, the Iops and SizeGiB fields will be ignored
264-
enum:
265-
- general-purpose
266-
- 5iops-tier
267-
- 10iops-tier
268-
- custom
269-
type: string
270-
sizeGiB:
271-
description: |-
272-
SizeGiB is the size of the virtual server's disk in GiB.
273-
Default to the size of the image's `minimum_provisioned_size`.
274-
format: int64
275-
type: integer
276-
type: object
277-
maxItems: 12
278-
type: array
279-
x-kubernetes-validations:
280-
- message: Values may only be added
281-
rule: oldSelf.all(x, x in self)
282223
bootVolume:
283224
description: BootVolume contains machines's boot volume configurations
284225
like size, iops etc..
@@ -312,10 +253,9 @@ spec:
312253
profile:
313254
default: general-purpose
314255
description: |-
315-
Profile is the volume profile for the disk, refer https://cloud.ibm.com/docs/vpc?topic=vpc-block-storage-profiles
256+
Profile is the volume profile for the bootdisk, refer https://cloud.ibm.com/docs/vpc?topic=vpc-block-storage-profiles
316257
for more information.
317258
Default to general-purpose
318-
NOTE: If a profile other than custom is specified, the Iops and SizeGiB fields will be ignored
319259
enum:
320260
- general-purpose
321261
- 5iops-tier
@@ -324,7 +264,7 @@ spec:
324264
type: string
325265
sizeGiB:
326266
description: |-
327-
SizeGiB is the size of the virtual server's disk in GiB.
267+
SizeGiB is the size of the virtual server's boot disk in GiB.
328268
Default to the size of the image's `minimum_provisioned_size`.
329269
format: int64
330270
type: integer
@@ -704,12 +644,6 @@ spec:
704644
description: V1beta2 groups all the fields that will be added or modified
705645
in IBMVPCMachine's status with the V1Beta2 version.
706646
properties:
707-
additionalVolumeIDs:
708-
description: AdditionalVolumeIDs is a list of Volume IDs as per
709-
IBMCloud
710-
items:
711-
type: string
712-
type: array
713647
conditions:
714648
description: Conditions represents the observations of a IBMVPCMachine's
715649
current state.

definitions/infrastructure.cluster.x-k8s.io/ibmvpcmachinetemplate.yaml

Lines changed: 3 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
88
cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
99
name: ibmvpcmachinetemplates.infrastructure.cluster.x-k8s.io
@@ -207,65 +207,6 @@ spec:
207207
description: Spec is the specification of the desired behavior
208208
of the machine.
209209
properties:
210-
additionalVolumes:
211-
description: |-
212-
additionalVolumes is the list of additional volumes attached to the instance
213-
There is a hard limit of 12 volume attachments per instance:
214-
https://cloud.ibm.com/docs/vpc?topic=vpc-attaching-block-storage&interface=api#vol-attach-limits
215-
items:
216-
description: VPCVolume defines the volume information.
217-
properties:
218-
deleteVolumeOnInstanceDelete:
219-
default: true
220-
description: |-
221-
DeleteVolumeOnInstanceDelete If set to true, when deleting the instance the volume will also be deleted.
222-
Default is set as true
223-
type: boolean
224-
encryptionKeyCRN:
225-
description: |-
226-
EncryptionKey is the root key to use to wrap the data encryption key for the volume and this points to the CRN
227-
and possible values are as follows.
228-
The CRN of the [Key Protect Root
229-
Key](https://cloud.ibm.com/docs/key-protect?topic=key-protect-getting-started-tutorial) or [Hyper Protect Crypto
230-
Service Root Key](https://cloud.ibm.com/docs/hs-crypto?topic=hs-crypto-get-started) for this resource.
231-
If unspecified, the `encryption` type for the volume will be `provider_managed`.
232-
type: string
233-
iops:
234-
description: |-
235-
Iops is the maximum I/O operations per second (IOPS) to use for the volume. Applicable only to volumes using a profile
236-
family of `custom`.
237-
format: int64
238-
type: integer
239-
name:
240-
description: |-
241-
Name is the unique user-defined name for this volume.
242-
Default will be autogenerated
243-
type: string
244-
profile:
245-
default: general-purpose
246-
description: |-
247-
Profile is the volume profile for the disk, refer https://cloud.ibm.com/docs/vpc?topic=vpc-block-storage-profiles
248-
for more information.
249-
Default to general-purpose
250-
NOTE: If a profile other than custom is specified, the Iops and SizeGiB fields will be ignored
251-
enum:
252-
- general-purpose
253-
- 5iops-tier
254-
- 10iops-tier
255-
- custom
256-
type: string
257-
sizeGiB:
258-
description: |-
259-
SizeGiB is the size of the virtual server's disk in GiB.
260-
Default to the size of the image's `minimum_provisioned_size`.
261-
format: int64
262-
type: integer
263-
type: object
264-
maxItems: 12
265-
type: array
266-
x-kubernetes-validations:
267-
- message: Values may only be added
268-
rule: oldSelf.all(x, x in self)
269210
bootVolume:
270211
description: BootVolume contains machines's boot volume configurations
271212
like size, iops etc..
@@ -299,10 +240,9 @@ spec:
299240
profile:
300241
default: general-purpose
301242
description: |-
302-
Profile is the volume profile for the disk, refer https://cloud.ibm.com/docs/vpc?topic=vpc-block-storage-profiles
243+
Profile is the volume profile for the bootdisk, refer https://cloud.ibm.com/docs/vpc?topic=vpc-block-storage-profiles
303244
for more information.
304245
Default to general-purpose
305-
NOTE: If a profile other than custom is specified, the Iops and SizeGiB fields will be ignored
306246
enum:
307247
- general-purpose
308248
- 5iops-tier
@@ -311,7 +251,7 @@ spec:
311251
type: string
312252
sizeGiB:
313253
description: |-
314-
SizeGiB is the size of the virtual server's disk in GiB.
254+
SizeGiB is the size of the virtual server's boot disk in GiB.
315255
Default to the size of the image's `minimum_provisioned_size`.
316256
format: int64
317257
type: integer

0 commit comments

Comments
 (0)