Skip to content

Commit 7abf184

Browse files
committed
Remove redundant nil check for mc
1 parent e53631e commit 7abf184

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

cmd/sidecar_mounter/main.go

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -97,22 +97,20 @@ func main() {
9797
klog.Infof("Running cloud profiler on %s", cfg.Service)
9898
}
9999
}
100-
if mc != nil {
101-
if mc.EnableSidecarBucketAccessCheck {
102-
mc.SidecarRetryConfig.Cap = *storageServiceAndBucketAccessCap
103-
mc.SidecarRetryConfig.Steps = *storageServiceAndBucketAccessSteps
104-
mc.SidecarRetryConfig.Factor = *storageServiceAndBucketAccessFactor
105-
mc.SidecarRetryConfig.Duration = *storageServiceAndBucketAccessDuration
106-
mc.SidecarRetryConfig.Jitter = *storageServiceAndBucketAccessJitter
107-
err := mounter.SetupTokenAndStorageManager(ctx, nil /*k8sClientset*/, mc)
108-
if err != nil {
109-
klog.Fatalf("Failed to fetch identity pool and identity provider details required for bucket access check, got error %v", err)
110-
}
111-
}
112-
if err := mounter.Mount(ctx, mc); err != nil {
113-
mc.ErrWriter.WriteMsg(fmt.Sprintf("failed to mount bucket %q for volume %q: %v\n", mc.BucketName, mc.VolumeName, err))
100+
if mc.EnableSidecarBucketAccessCheck {
101+
mc.SidecarRetryConfig.Cap = *storageServiceAndBucketAccessCap
102+
mc.SidecarRetryConfig.Steps = *storageServiceAndBucketAccessSteps
103+
mc.SidecarRetryConfig.Factor = *storageServiceAndBucketAccessFactor
104+
mc.SidecarRetryConfig.Duration = *storageServiceAndBucketAccessDuration
105+
mc.SidecarRetryConfig.Jitter = *storageServiceAndBucketAccessJitter
106+
err := mounter.SetupTokenAndStorageManager(ctx, nil /*k8sClientset*/, mc)
107+
if err != nil {
108+
klog.Fatalf("Failed to fetch identity pool and identity provider details required for bucket access check, got error %v", err)
114109
}
115110
}
111+
if err := mounter.Mount(ctx, mc); err != nil {
112+
mc.ErrWriter.WriteMsg(fmt.Sprintf("failed to mount bucket %q for volume %q: %v\n", mc.BucketName, mc.VolumeName, err))
113+
}
116114
}
117115

118116
c := make(chan os.Signal, 1)

0 commit comments

Comments
 (0)