github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix golint errors

Browse Source 
Revealed by the new SELinux warning controller, but not related to it.
This commit is contained in:
Jan Safranek 2024-10-25 15:37:52 +02:00
parent aa8872d7a3
commit da2d9fa16e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/core.go
View File

@ -141,7 +141,7 @@ func startNodeIpamController(ctx context.Context, controllerContext ControllerCo
// should be dual stack (from different IPFamilies) // should be dual stack (from different IPFamilies)
dualstackServiceCIDR, err := netutils.IsDualStackCIDRs([]*net.IPNet{serviceCIDR, secondaryServiceCIDR}) dualstackServiceCIDR, err := netutils.IsDualStackCIDRs([]*net.IPNet{serviceCIDR, secondaryServiceCIDR})
if err != nil { if err != nil {
return nil, false, fmt.Errorf("failed to perform dualstack check on serviceCIDR and secondaryServiceCIDR error: %v", err) return nil, false, fmt.Errorf("failed to perform dualstack check on serviceCIDR and secondaryServiceCIDR error: %w", err)
} }
if !dualstackServiceCIDR { if !dualstackServiceCIDR {
return nil, false, fmt.Errorf("serviceCIDR and secondaryServiceCIDR are not dualstack (from different IPfamiles)") return nil, false, fmt.Errorf("serviceCIDR and secondaryServiceCIDR are not dualstack (from different IPfamiles)")

8
pkg/controller/volume/attachdetach/util/util.go
View File

@ -55,7 +55,7 @@ func createInTreeVolumeSpec(logger klog.Logger, podVolume *v1.Volume, pod *v1.Po
pvc, err := getPVCFromCache(pod.Namespace, claimName, pvcLister) pvc, err := getPVCFromCache(pod.Namespace, claimName, pvcLister)
if err != nil { if err != nil {
return nil, claimName, fmt.Errorf( return nil, claimName, fmt.Errorf(
"error processing PVC %q/%q: %v", "error processing PVC %q/%q: %w",
pod.Namespace, pod.Namespace,
claimName, claimName,
err) err)
@ -74,7 +74,7 @@ func createInTreeVolumeSpec(logger klog.Logger, podVolume *v1.Volume, pod *v1.Po
pvName, readOnly, pvcUID, pvLister) pvName, readOnly, pvcUID, pvLister)
if err != nil { if err != nil {
return nil, claimName, fmt.Errorf( return nil, claimName, fmt.Errorf(
"error processing PVC %q/%q: %v", "error processing PVC %q/%q: %w",
pod.Namespace, pod.Namespace,
claimName, claimName,
err) err)
@ -92,7 +92,7 @@ func CreateVolumeSpec(logger klog.Logger, podVolume v1.Volume, pod *v1.Pod, vpm
volumeSpec, err = translateInTreeSpecToCSIIfNeeded(logger, volumeSpec, vpm, csiMigratedPluginManager, csiTranslator, pod.Namespace) volumeSpec, err = translateInTreeSpecToCSIIfNeeded(logger, volumeSpec, vpm, csiMigratedPluginManager, csiTranslator, pod.Namespace)
if err != nil { if err != nil {
return nil, fmt.Errorf( return nil, fmt.Errorf(
"error performing CSI migration checks and translation for PVC %q/%q: %v", "error performing CSI migration checks and translation for PVC %q/%q: %w",
pod.Namespace, pod.Namespace,
claimName, claimName,
err) err)
@ -113,7 +113,7 @@ func CreateVolumeSpecWithNodeMigration(logger klog.Logger, podVolume v1.Volume,
volumeSpec, err = translateInTreeSpecToCSIOnNodeIfNeeded(logger, volumeSpec, nodeName, vpm, csiMigratedPluginManager, csiTranslator, pod.Namespace) volumeSpec, err = translateInTreeSpecToCSIOnNodeIfNeeded(logger, volumeSpec, nodeName, vpm, csiMigratedPluginManager, csiTranslator, pod.Namespace)
if err != nil { if err != nil {
return nil, fmt.Errorf( return nil, fmt.Errorf(
"error performing CSI migration checks and translation for PVC %q/%q: %v", "error performing CSI migration checks and translation for PVC %q/%q: %w",
pod.Namespace, pod.Namespace,
claimName, claimName,
err) err)