Merge pull request #1477 from hj-johannes-lee/PR-2023-023

mythi · web-flow · commit 89986b9972c4 · 2023-07-20T18:33:57.000+03:00
Makefile: update versions &amp; FPGA: fix naked return error from linter
diff --git a/Makefile b/Makefile
@@ -8,9 +8,9 @@ BUILDTAGS ?= ""
 BUILDER ?= "docker"
 EXTRA_BUILD_ARGS ?= ""
 
-CERT_MANAGER_VERSION ?= v1.12.0
-CONTROLLER_GEN_VERSION ?= v0.12.0
-GOLANGCI_LINT_VERSION ?= v1.52.2
+CERT_MANAGER_VERSION ?= v1.12.2
+CONTROLLER_GEN_VERSION ?= v0.12.1
+GOLANGCI_LINT_VERSION ?= v1.53.3
 KIND_VERSION ?= v0.19.0
 GOLICENSES_VERSION ?= v1.6.0
 # Default bundle image tag
diff --git a/cmd/fpga_tool/fpga_tool.go b/cmd/fpga_tool/fpga_tool.go
@@ -118,7 +118,7 @@ func validateFlags(cmd, bitstream, device string, port uint) error {
 func installBitstream(fname string, dryRun, force, quiet bool) (err error) {
 	info, err := bitstream.Open(fname)
 	if err != nil {
-		return
+		return err
 	}
 	defer info.Close()
 
@@ -129,7 +129,7 @@ func installBitstream(fname string, dryRun, force, quiet bool) (err error) {
 
 		if dryRun {
 			fmt.Println("Dry-run: no copying performed")
-			return
+			return nil
 		}
 	}
 
@@ -285,21 +285,21 @@ func printFpgaPort(f fpga.Port, quiet bool) (err error) {
 
 	pci, err := f.GetPCIDevice()
 	if err != nil {
-		return
+		return err
 	}
 
 	printPCIeInfo(pci, quiet)
 
 	fme, err := f.GetFME()
 	if err != nil {
-		return
+		return err
 	}
 
 	fmt.Printf("FME Name                         : %s\n", fme.GetName())
 
 	num, err := f.GetPortID()
 	if err != nil {
-		return
+		return err
 	}
 
 	fmt.Printf("Port Id                          : %d\n", num)
diff --git a/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_acceleratorfunctions.yaml b/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_acceleratorfunctions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: acceleratorfunctions.fpga.intel.com
 spec:
   group: fpga.intel.com
diff --git a/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_fpgaregions.yaml b/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_fpgaregions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: fpgaregions.fpga.intel.com
 spec:
   group: fpga.intel.com
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_dlbdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_dlbdeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: dlbdeviceplugins.deviceplugin.intel.com
 spec:
   group: deviceplugin.intel.com
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: dsadeviceplugins.deviceplugin.intel.com
 spec:
   group: deviceplugin.intel.com
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: fpgadeviceplugins.deviceplugin.intel.com
 spec:
   group: deviceplugin.intel.com
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: gpudeviceplugins.deviceplugin.intel.com
 spec:
   group: deviceplugin.intel.com
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_iaadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_iaadeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: iaadeviceplugins.deviceplugin.intel.com
 spec:
   group: deviceplugin.intel.com
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: qatdeviceplugins.deviceplugin.intel.com
 spec:
   group: deviceplugin.intel.com
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: sgxdeviceplugins.deviceplugin.intel.com
 spec:
   group: deviceplugin.intel.com
diff --git a/deployments/operator/crd/bases/fpga.intel.com_acceleratorfunctions.yaml b/deployments/operator/crd/bases/fpga.intel.com_acceleratorfunctions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: acceleratorfunctions.fpga.intel.com
 spec:
   group: fpga.intel.com
diff --git a/deployments/operator/crd/bases/fpga.intel.com_fpgaregions.yaml b/deployments/operator/crd/bases/fpga.intel.com_fpgaregions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: fpgaregions.fpga.intel.com
 spec:
   group: fpga.intel.com
diff --git a/pkg/fpga/dfl_linux.go b/pkg/fpga/dfl_linux.go
@@ -403,7 +403,7 @@ func (f *DflPort) GetFME() (fme FME, err error) {
 
 	pci, err := f.GetPCIDevice()
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	if pci.PhysFn != nil {
@@ -417,17 +417,17 @@ func (f *DflPort) GetFME() (fme FME, err error) {
 	}
 
 	if err = readFilesInDirectory(fileMap, filepath.Join(pci.SysFsPath, dflFpgaFmeGlobPCI)); err != nil {
-		return
+		return nil, err
 	}
 
 	realDev, err := filepath.EvalSymlinks(filepath.Join("/dev/char", dev))
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	fme, err = NewDflFME(realDev)
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	f.FME = fme
diff --git a/pkg/fpga/intel_fpga_linux.go b/pkg/fpga/intel_fpga_linux.go
@@ -408,7 +408,7 @@ func (f *IntelFpgaPort) GetFME() (fme FME, err error) {
 
 	pci, err := f.GetPCIDevice()
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	if pci.PhysFn != nil {
@@ -421,17 +421,17 @@ func (f *IntelFpgaPort) GetFME() (fme FME, err error) {
 		"dev": &dev,
 	}
 	if err = readFilesInDirectory(fileMap, filepath.Join(pci.SysFsPath, intelFpgaFmeGlobPCI)); err != nil {
-		return
+		return nil, err
 	}
 
 	realDev, err := filepath.EvalSymlinks(filepath.Join("/dev/char", dev))
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	fme, err = NewIntelFpgaFME(realDev)
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	f.FME = fme

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func validateFlags(cmd, bitstream, device string, port uint) error {`
`118`	`118`	`func installBitstream(fname string, dryRun, force, quiet bool) (err error) {`
`119`	`119`	`info, err := bitstream.Open(fname)`
`120`	`120`	`if err != nil {`
`121`		`- return`
	`121`	`+ return err`
`122`	`122`	`}`
`123`	`123`	`defer info.Close()`
`124`	`124`
`@@ -129,7 +129,7 @@ func installBitstream(fname string, dryRun, force, quiet bool) (err error) {`
`129`	`129`
`130`	`130`	`if dryRun {`
`131`	`131`	`fmt.Println("Dry-run: no copying performed")`
`132`		`- return`
	`132`	`+ return nil`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
`@@ -285,21 +285,21 @@ func printFpgaPort(f fpga.Port, quiet bool) (err error) {`
`285`	`285`
`286`	`286`	`pci, err := f.GetPCIDevice()`
`287`	`287`	`if err != nil {`
`288`		`- return`
	`288`	`+ return err`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`printPCIeInfo(pci, quiet)`
`292`	`292`
`293`	`293`	`fme, err := f.GetFME()`
`294`	`294`	`if err != nil {`
`295`		`- return`
	`295`	`+ return err`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`fmt.Printf("FME Name : %s\n", fme.GetName())`
`299`	`299`
`300`	`300`	`num, err := f.GetPortID()`
`301`	`301`	`if err != nil {`
`302`		`- return`
	`302`	`+ return err`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`fmt.Printf("Port Id : %d\n", num)`
Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ func (f *DflPort) GetFME() (fme FME, err error) {`
`403`	`403`
`404`	`404`	`pci, err := f.GetPCIDevice()`
`405`	`405`	`if err != nil {`
`406`		`- return`
	`406`	`+ return nil, err`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`if pci.PhysFn != nil {`
`@@ -417,17 +417,17 @@ func (f *DflPort) GetFME() (fme FME, err error) {`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`if err = readFilesInDirectory(fileMap, filepath.Join(pci.SysFsPath, dflFpgaFmeGlobPCI)); err != nil {`
`420`		`- return`
	`420`	`+ return nil, err`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`realDev, err := filepath.EvalSymlinks(filepath.Join("/dev/char", dev))`
`424`	`424`	`if err != nil {`
`425`		`- return`
	`425`	`+ return nil, err`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`fme, err = NewDflFME(realDev)`
`429`	`429`	`if err != nil {`
`430`		`- return`
	`430`	`+ return nil, err`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`f.FME = fme`
Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ func (f *IntelFpgaPort) GetFME() (fme FME, err error) {`
`408`	`408`
`409`	`409`	`pci, err := f.GetPCIDevice()`
`410`	`410`	`if err != nil {`
`411`		`- return`
	`411`	`+ return nil, err`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`if pci.PhysFn != nil {`
`@@ -421,17 +421,17 @@ func (f *IntelFpgaPort) GetFME() (fme FME, err error) {`
`421`	`421`	`"dev": &dev,`
`422`	`422`	`}`
`423`	`423`	`if err = readFilesInDirectory(fileMap, filepath.Join(pci.SysFsPath, intelFpgaFmeGlobPCI)); err != nil {`
`424`		`- return`
	`424`	`+ return nil, err`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`realDev, err := filepath.EvalSymlinks(filepath.Join("/dev/char", dev))`
`428`	`428`	`if err != nil {`
`429`		`- return`
	`429`	`+ return nil, err`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`fme, err = NewIntelFpgaFME(realDev)`
`433`	`433`	`if err != nil {`
`434`		`- return`
	`434`	`+ return nil, err`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`f.FME = fme`