Skip to content

Commit 8fbde63

Browse files
committed
Fix test failures
1 parent 01de3b4 commit 8fbde63

4 files changed

+4
-6
lines changed

api/v1beta2/ibmpowervscluster_types.go

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ type IBMPowerVSClusterSpec struct {
4949
// dhcpServer is contains the configuration to be used while creating a new DHCP server in PowerVS workspace.
5050
// when the field is omitted, CLUSTER_NAME will be used as DHCPServer.Name and DHCP server will be created.
5151
// it will automatically create network with name DHCPSERVER<DHCPServer.Name>_Private in PowerVS workspace.
52-
// the default name
5352
// +optional
5453
DHCPServer *DHCPServer `json:"dhcpServer,omitempty"`
5554

cloud/scope/powervs_machine.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ func (m *PowerVSMachineScope) SetHealth(health *models.PVMInstanceHealth) {
717717
}
718718

719719
// SetAddresses will set the addresses for the machine.
720-
func (m *PowerVSMachineScope) SetAddresses(instance *models.PVMInstance) {
720+
func (m *PowerVSMachineScope) SetAddresses(instance *models.PVMInstance) { //nolint:gocyclo
721721
var addresses []corev1.NodeAddress
722722
// Setting the name of the vm to the InternalDNS and Hostname as the vm uses that as hostname.
723723
addresses = append(addresses, corev1.NodeAddress{
@@ -910,7 +910,7 @@ func (m *PowerVSMachineScope) GetMachineInternalIP() string {
910910
}
911911

912912
// CreateVPCLoadBalancerPoolMember creates a member in load balaner pool.
913-
func (m *PowerVSMachineScope) CreateVPCLoadBalancerPoolMember() (*vpcv1.LoadBalancerPoolMember, error) {
913+
func (m *PowerVSMachineScope) CreateVPCLoadBalancerPoolMember() (*vpcv1.LoadBalancerPoolMember, error) { //nolint:gocyclo
914914
loadBalancers := make([]infrav1beta2.VPCLoadBalancerSpec, 0)
915915
if len(m.IBMPowerVSCluster.Spec.LoadBalancers) == 0 {
916916
loadBalancer := infrav1beta2.VPCLoadBalancerSpec{

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ spec:
204204
creating a new DHCP server in PowerVS workspace. when the field
205205
is omitted, CLUSTER_NAME will be used as DHCPServer.Name and DHCP
206206
server will be created. it will automatically create network with
207-
name DHCPSERVER<DHCPServer.Name>_Private in PowerVS workspace. the
208-
default name
207+
name DHCPSERVER<DHCPServer.Name>_Private in PowerVS workspace.
209208
properties:
210209
cidr:
211210
description: Optional cidr for DHCP private network

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclustertemplates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ spec:
231231
when the field is omitted, CLUSTER_NAME will be used as
232232
DHCPServer.Name and DHCP server will be created. it will
233233
automatically create network with name DHCPSERVER<DHCPServer.Name>_Private
234-
in PowerVS workspace. the default name
234+
in PowerVS workspace.
235235
properties:
236236
cidr:
237237
description: Optional cidr for DHCP private network

0 commit comments

Comments
 (0)