Cherry-pick fixes

Author: GouthamML

pkg/cloudprovider/providers/oci/load_balancer_spec_test.go

@@ -10662,15 +10662,14 @@ func Test_getNetworkLoadbalancerSubnets(t *testing.T) {
 	}
 
 	for name, tc := range testCases {
-		logger := zap.L()
 		t.Run(name, func(t *testing.T) {
 			cp.config = &providercfg.Config{
 				LoadBalancer: &providercfg.LoadBalancerConfig{
 					Subnet1: tc.defaultSubnetOne,
 					Subnet2: tc.defaultSubnetTwo,
 				},
 			}
-			subnets, err := cp.getNetworkLoadbalancerSubnets(context.Background(), logger.Sugar(), tc.service)
+			subnets, err := cp.getNetworkLoadbalancerSubnets(tc.service)
 			if !reflect.DeepEqual(subnets, tc.subnets) {
 				t.Errorf("Expected \n%+v\nbut got\n%+v", tc.subnets, subnets)
 			}

pkg/csi/driver/bv_node.go

@@ -792,9 +792,9 @@ func (d BlockVolumeNodeDriver) NodeGetInfo(ctx context.Context, req *csi.NodeGet
 			return nil, status.Error(codes.Internal, "Failed to get availability domain of node from kube api server.")
 		}
 	}
-	segments := map[string]string {
-		kubeAPI.LabelZoneFailureDomain:   d.nodeMetadata.AvailabilityDomain,
-		kubeAPI.LabelTopologyZone:        d.nodeMetadata.AvailabilityDomain,
+	segments := map[string]string{
+		kubeAPI.LabelZoneFailureDomain: d.nodeMetadata.AvailabilityDomain,
+		kubeAPI.LabelTopologyZone:      d.nodeMetadata.AvailabilityDomain,
 	}
 
 	//set full ad name in segments only for IPv6 single stack
@@ -815,10 +815,7 @@ func (d BlockVolumeNodeDriver) NodeGetInfo(ctx context.Context, req *csi.NodeGet
 
 		// make sure that the driver works on this particular AD only
 		AccessibleTopology: &csi.Topology{
-			Segments: map[string]string{
-				kubeAPI.LabelZoneFailureDomain: ad,
-				kubeAPI.LabelTopologyZone:      ad,
-			},
+			Segments: segments,
 		},
 	}, nil
 }