Skip to content

Commit

Permalink
mod : removed the unused service config argument and modified the tes…
Browse files Browse the repository at this point in the history
…t to fit new function modification (#2450)
  • Loading branch information
yorubad-dev authored Oct 26, 2023
1 parent 2329109 commit 47c3b0e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions pkg/openstack/loadbalancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ func (lbaas *LbaasV2) buildListenerCreateOpt(port corev1.ServicePort, svcConf *s
}

// getMemberSubnetID gets the configured member-subnet-id from the different possible sources.
func (lbaas *LbaasV2) getMemberSubnetID(service *corev1.Service, svcConf *serviceConfig) (string, error) {
func (lbaas *LbaasV2) getMemberSubnetID(service *corev1.Service) (string, error) {
// Get Member Subnet from Service Annotation
memberSubnetIDAnnotation := getStringFromServiceAnnotation(service, ServiceAnnotationLoadBalancerMemberSubnetID, "")
if memberSubnetIDAnnotation != "" {
Expand Down Expand Up @@ -1534,7 +1534,7 @@ func (lbaas *LbaasV2) checkServiceUpdate(service *corev1.Service, nodes []*corev
svcConf.supportLBTags = openstackutil.IsOctaviaFeatureSupported(lbaas.lb, openstackutil.OctaviaFeatureTags, lbaas.opts.LBProvider)

// Find subnet ID for creating members
memberSubnetID, err := lbaas.getMemberSubnetID(service, svcConf)
memberSubnetID, err := lbaas.getMemberSubnetID(service)
if err != nil {
return fmt.Errorf("unable to get member-subnet-id, %w", err)
}
Expand Down Expand Up @@ -1681,7 +1681,7 @@ func (lbaas *LbaasV2) checkService(service *corev1.Service, nodes []*corev1.Node

// Override the specific member-subnet-id, if explictly configured.
// Otherwise use subnet-id.
memberSubnetID, err := lbaas.getMemberSubnetID(service, svcConf)
memberSubnetID, err := lbaas.getMemberSubnetID(service)
if err != nil {
return fmt.Errorf("unable to get member-subnet-id, %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/openstack/loadbalancer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1784,7 +1784,7 @@ func TestLbaasV2_getMemberSubnetID(t *testing.T) {
},
}

got, err := lbaas.getMemberSubnetID(tt.service, &serviceConfig{})
got, err := lbaas.getMemberSubnetID(tt.service)
if tt.wantErr != "" {
assert.EqualError(t, err, tt.wantErr)
} else {
Expand Down

0 comments on commit 47c3b0e

Please sign in to comment.