Skip to content

Commit cc61a06

Browse files
Prajyot-ParabPrajyot-Parab
authored
Fix VPC related issues and minor lint updates (#622)
* minor post-linting process updates Signed-off-by: Prajyot-Parab <[email protected]> * Fix VPC related issues Signed-off-by: Prajyot-Parab <[email protected]>
1 parent f5e22b5 commit cc61a06

12 files changed

+133
-135
lines changed

‎cloud/scope/cluster.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,13 @@ func (s *ClusterScope) CreateSubnet() (*vpcv1.Subnet, error) {
221221
Zone: &vpcv1.ZoneIdentity{
222222
Name: &s.IBMVPCCluster.Spec.Zone,
223223
},
224+
ResourceGroup: &vpcv1.ResourceGroupIdentity{
225+
ID: &s.IBMVPCCluster.Spec.ResourceGroup,
226+
},
224227
})
225228
subnet, _, err := s.IBMVPCClients.VPCService.CreateSubnet(options)
226229
if subnet != nil {
227-
pgw, err := s.createPublicGateWay(s.IBMVPCCluster.Status.VPC.ID, s.IBMVPCCluster.Spec.Zone)
230+
pgw, err := s.createPublicGateWay(s.IBMVPCCluster.Status.VPC.ID, s.IBMVPCCluster.Spec.Zone, s.IBMVPCCluster.Spec.ResourceGroup)
228231
if err != nil {
229232
return subnet, err
230233
}
@@ -295,14 +298,17 @@ func (s *ClusterScope) DeleteSubnet() error {
295298
return err
296299
}
297300

298-
func (s *ClusterScope) createPublicGateWay(vpcID string, zoneName string) (*vpcv1.PublicGateway, error) {
301+
func (s *ClusterScope) createPublicGateWay(vpcID string, zoneName string, resourceGroupID string) (*vpcv1.PublicGateway, error) {
299302
options := &vpcv1.CreatePublicGatewayOptions{}
300303
options.SetVPC(&vpcv1.VPCIdentity{
301304
ID: &vpcID,
302305
})
303306
options.SetZone(&vpcv1.ZoneIdentity{
304307
Name: &zoneName,
305308
})
309+
options.SetResourceGroup(&vpcv1.ResourceGroupIdentity{
310+
ID: &resourceGroupID,
311+
})
306312
publicGateway, _, err := s.IBMVPCClients.VPCService.CreatePublicGateway(options)
307313
return publicGateway, err
308314
}

‎cloud/scope/machine.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ func (m *MachineScope) CreateMachine() (*vpcv1.Instance, error) {
125125
ID: &m.IBMVPCMachine.Spec.PrimaryNetworkInterface.Subnet,
126126
},
127127
},
128+
ResourceGroup: &vpcv1.ResourceGroupIdentity{
129+
ID: &m.IBMVPCCluster.Spec.ResourceGroup,
130+
},
128131
UserData: &cloudInitData,
129132
}
130133

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclusters.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
- name: v1alpha4
1919
schema:
2020
openAPIV3Schema:
21-
description: IBMPowerVSCluster is the Schema for the ibmpowervsclusters API
21+
description: IBMPowerVSCluster is the Schema for the ibmpowervsclusters API.
2222
properties:
2323
apiVersion:
2424
description: 'APIVersion defines the versioned schema of this representation
@@ -33,7 +33,7 @@ spec:
3333
metadata:
3434
type: object
3535
spec:
36-
description: IBMPowerVSClusterSpec defines the desired state of IBMPowerVSCluster
36+
description: IBMPowerVSClusterSpec defines the desired state of IBMPowerVSCluster.
3737
properties:
3838
controlPlaneEndpoint:
3939
description: ControlPlaneEndpoint represents the endpoint used to
@@ -63,14 +63,14 @@ spec:
6363
type: object
6464
serviceInstanceID:
6565
description: ServiceInstanceID is the id of the power cloud instance
66-
where the vsi instance will get deployed
66+
where the vsi instance will get deployed.
6767
type: string
6868
required:
6969
- network
7070
- serviceInstanceID
7171
type: object
7272
status:
73-
description: IBMPowerVSClusterStatus defines the observed state of IBMPowerVSCluster
73+
description: IBMPowerVSClusterStatus defines the observed state of IBMPowerVSCluster.
7474
properties:
7575
ready:
7676
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
@@ -88,7 +88,7 @@ spec:
8888
- name: v1beta1
8989
schema:
9090
openAPIV3Schema:
91-
description: IBMPowerVSCluster is the Schema for the ibmpowervsclusters API
91+
description: IBMPowerVSCluster is the Schema for the ibmpowervsclusters API.
9292
properties:
9393
apiVersion:
9494
description: 'APIVersion defines the versioned schema of this representation
@@ -103,7 +103,7 @@ spec:
103103
metadata:
104104
type: object
105105
spec:
106-
description: IBMPowerVSClusterSpec defines the desired state of IBMPowerVSCluster
106+
description: IBMPowerVSClusterSpec defines the desired state of IBMPowerVSCluster.
107107
properties:
108108
controlPlaneEndpoint:
109109
description: ControlPlaneEndpoint represents the endpoint used to
@@ -135,15 +135,15 @@ spec:
135135
type: object
136136
serviceInstanceID:
137137
description: ServiceInstanceID is the id of the power cloud instance
138-
where the vsi instance will get deployed
138+
where the vsi instance will get deployed.
139139
minLength: 1
140140
type: string
141141
required:
142142
- network
143143
- serviceInstanceID
144144
type: object
145145
status:
146-
description: IBMPowerVSClusterStatus defines the observed state of IBMPowerVSCluster
146+
description: IBMPowerVSClusterStatus defines the observed state of IBMPowerVSCluster.
147147
properties:
148148
ready:
149149
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsimages.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
name: v1beta1
2828
schema:
2929
openAPIV3Schema:
30-
description: IBMPowerVSImage is the Schema for the ibmpowervsimages API
30+
description: IBMPowerVSImage is the Schema for the ibmpowervsimages API.
3131
properties:
3232
apiVersion:
3333
description: 'APIVersion defines the versioned schema of this representation
@@ -42,7 +42,7 @@ spec:
4242
metadata:
4343
type: object
4444
spec:
45-
description: IBMPowerVSImageSpec defines the desired state of IBMPowerVSImage
45+
description: IBMPowerVSImageSpec defines the desired state of IBMPowerVSImage.
4646
properties:
4747
bucket:
4848
description: Cloud Object Storage bucket name; bucket-name[/optional/folder]
@@ -61,19 +61,19 @@ spec:
6161
- retain
6262
type: string
6363
object:
64-
description: Cloud Object Storage image filename
64+
description: Cloud Object Storage image filename.
6565
type: string
6666
region:
67-
description: Cloud Object Storage region
67+
description: Cloud Object Storage region.
6868
type: string
6969
serviceInstanceID:
7070
description: ServiceInstanceID is the id of the power cloud instance
71-
where the image will get imported
71+
where the image will get imported.
7272
type: string
7373
storageType:
7474
default: tier1
7575
description: Type of storage, storage pool with the most available
76-
space will be selected
76+
space will be selected.
7777
enum:
7878
- tier1
7979
- tier3
@@ -86,7 +86,7 @@ spec:
8686
- serviceInstanceID
8787
type: object
8888
status:
89-
description: IBMPowerVSImageStatus defines the observed state of IBMPowerVSImage
89+
description: IBMPowerVSImageStatus defines the observed state of IBMPowerVSImage.
9090
properties:
9191
conditions:
9292
description: Conditions defines current service state of the IBMPowerVSImage.
@@ -134,13 +134,13 @@ spec:
134134
type: object
135135
type: array
136136
imageID:
137-
description: ImageID is the id of the imported image
137+
description: ImageID is the id of the imported image.
138138
type: string
139139
imageState:
140-
description: ImageState is the status of the imported image
140+
description: ImageState is the status of the imported image.
141141
type: string
142142
jobID:
143-
description: JobID is the job ID of an import operation
143+
description: JobID is the job ID of an import operation.
144144
type: string
145145
ready:
146146
description: Ready is true when the provider resource is ready.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachines.yaml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
name: v1alpha4
3636
schema:
3737
openAPIV3Schema:
38-
description: IBMPowerVSMachine is the Schema for the ibmpowervsmachines API
38+
description: IBMPowerVSMachine is the Schema for the ibmpowervsmachines API.
3939
properties:
4040
apiVersion:
4141
description: 'APIVersion defines the versioned schema of this representation
@@ -50,7 +50,7 @@ spec:
5050
metadata:
5151
type: object
5252
spec:
53-
description: IBMPowerVSMachineSpec defines the desired state of IBMPowerVSMachine
53+
description: IBMPowerVSMachineSpec defines the desired state of IBMPowerVSMachine.
5454
properties:
5555
image:
5656
description: Image is the reference to the Image from which to create
@@ -82,22 +82,22 @@ spec:
8282
capped'
8383
type: string
8484
processors:
85-
description: Processors is Number of processors allocated
85+
description: Processors is Number of processors allocated.
8686
type: string
8787
providerID:
8888
description: ProviderID is the unique identifier as specified by the
8989
cloud provider.
9090
type: string
9191
serviceInstanceID:
9292
description: ServiceInstanceID is the id of the power cloud instance
93-
where the vsi instance will get deployed
93+
where the vsi instance will get deployed.
9494
type: string
9595
sshKey:
9696
description: SSHKey is the name of the SSH key pair provided to the
97-
vsi for authenticating users
97+
vsi for authenticating users.
9898
type: string
9999
sysType:
100-
description: SysType is the System type used to host the vsi
100+
description: SysType is the System type used to host the vsi.
101101
type: string
102102
required:
103103
- image
@@ -109,7 +109,7 @@ spec:
109109
- sysType
110110
type: object
111111
status:
112-
description: IBMPowerVSMachineStatus defines the observed state of IBMPowerVSMachine
112+
description: IBMPowerVSMachineStatus defines the observed state of IBMPowerVSMachine.
113113
properties:
114114
addresses:
115115
description: Addresses contains the vsi associated addresses.
@@ -129,15 +129,15 @@ spec:
129129
type: object
130130
type: array
131131
fault:
132-
description: Fault will report if any fault messages for the vsi
132+
description: Fault will report if any fault messages for the vsi.
133133
type: string
134134
health:
135-
description: Health is the health of the vsi
135+
description: Health is the health of the vsi.
136136
type: string
137137
instanceID:
138138
type: string
139139
instanceState:
140-
description: InstanceState is the status of the vsi
140+
description: InstanceState is the status of the vsi.
141141
type: string
142142
ready:
143143
description: Ready is true when the provider resource is ready.
@@ -170,7 +170,7 @@ spec:
170170
name: v1beta1
171171
schema:
172172
openAPIV3Schema:
173-
description: IBMPowerVSMachine is the Schema for the ibmpowervsmachines API
173+
description: IBMPowerVSMachine is the Schema for the ibmpowervsmachines API.
174174
properties:
175175
apiVersion:
176176
description: 'APIVersion defines the versioned schema of this representation
@@ -185,7 +185,7 @@ spec:
185185
metadata:
186186
type: object
187187
spec:
188-
description: IBMPowerVSMachineSpec defines the desired state of IBMPowerVSMachine
188+
description: IBMPowerVSMachineSpec defines the desired state of IBMPowerVSMachine.
189189
properties:
190190
image:
191191
description: Image is the reference to the Image from which to create
@@ -231,30 +231,30 @@ spec:
231231
capped'
232232
type: string
233233
processors:
234-
description: Processors is Number of processors allocated
234+
description: Processors is Number of processors allocated.
235235
type: string
236236
providerID:
237237
description: ProviderID is the unique identifier as specified by the
238238
cloud provider.
239239
type: string
240240
serviceInstanceID:
241241
description: ServiceInstanceID is the id of the power cloud instance
242-
where the vsi instance will get deployed
242+
where the vsi instance will get deployed.
243243
minLength: 1
244244
type: string
245245
sshKey:
246246
description: SSHKey is the name of the SSH key pair provided to the
247-
vsi for authenticating users
247+
vsi for authenticating users.
248248
type: string
249249
sysType:
250-
description: SysType is the System type used to host the vsi
250+
description: SysType is the System type used to host the vsi.
251251
type: string
252252
required:
253253
- network
254254
- serviceInstanceID
255255
type: object
256256
status:
257-
description: IBMPowerVSMachineStatus defines the observed state of IBMPowerVSMachine
257+
description: IBMPowerVSMachineStatus defines the observed state of IBMPowerVSMachine.
258258
properties:
259259
addresses:
260260
description: Addresses contains the vsi associated addresses.
@@ -349,24 +349,24 @@ spec:
349349
the Machine object and/or logged in the controller's output."
350350
type: string
351351
fault:
352-
description: Fault will report if any fault messages for the vsi
352+
description: Fault will report if any fault messages for the vsi.
353353
type: string
354354
health:
355-
description: Health is the health of the vsi
355+
description: Health is the health of the vsi.
356356
type: string
357357
instanceID:
358358
type: string
359359
instanceState:
360-
description: InstanceState is the status of the vsi
360+
description: InstanceState is the status of the vsi.
361361
type: string
362362
ready:
363363
description: Ready is true when the provider resource is ready.
364364
type: boolean
365365
region:
366-
description: Region specifies the Power VS Service instance region
366+
description: Region specifies the Power VS Service instance region.
367367
type: string
368368
zone:
369-
description: Zone specifies the Power VS Service instance zone
369+
description: Zone specifies the Power VS Service instance zone.
370370
type: string
371371
type: object
372372
type: object

0 commit comments

Comments
 (0)