Skip to content

Commit d794397

Browse files
committed
Fix govet errors
Do not copy NodeGetInfoResponse, it contains many private fields, incl. a mutex that should not be copied. Use a pointer instead.
1 parent e26da09 commit d794397

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cmd/csi-provisioner/csi-provisioner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ func main() {
318318
if err != nil {
319319
klog.Fatalf("Failed to get node info from CSI driver: %v", err)
320320
}
321-
nodeDeployment.NodeInfo = *nodeInfo
321+
nodeDeployment.NodeInfo = nodeInfo
322322
}
323323

324324
var nodeLister listersv1.NodeLister

pkg/controller/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ type NodeDeployment struct {
233233
ClaimInformer coreinformers.PersistentVolumeClaimInformer
234234
// NodeInfo is the result of NodeGetInfo. It is need to determine which
235235
// PVs were created for the node.
236-
NodeInfo csi.NodeGetInfoResponse
236+
NodeInfo *csi.NodeGetInfoResponse
237237
// ImmediateBinding enables support for PVCs with immediate binding.
238238
ImmediateBinding bool
239239
// BaseDelay is the initial time that the external-provisioner waits
@@ -850,7 +850,7 @@ func (p *csiProvisioner) Provision(ctx context.Context, options controller.Provi
850850
}
851851

852852
if rep.Volume != nil {
853-
klog.V(3).Infof("create volume rep: %+v", *rep.Volume)
853+
klog.V(3).Infof("create volume rep: %+v", rep.Volume)
854854
}
855855
volumeAttributes := map[string]string{provisionerIDKey: p.identity}
856856
for k, v := range rep.Volume.VolumeContext {

pkg/controller/controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5540,7 +5540,7 @@ func runDeleteTest(t *testing.T, k string, tc deleteTestcase) {
55405540
nodeDeployment = &NodeDeployment{
55415541
NodeName: tc.deploymentNode,
55425542
ClaimInformer: claimInformer,
5543-
NodeInfo: csi.NodeGetInfoResponse{
5543+
NodeInfo: &csi.NodeGetInfoResponse{
55445544
NodeId: tc.deploymentNode,
55455545
AccessibleTopology: &csi.Topology{
55465546
Segments: map[string]string{

0 commit comments

Comments
 (0)