bump to go1.19 and minor fixes based on pr review feedback

harvester · Jul 3, 2023 · aa02b9c · aa02b9c
1 parent 6a9d552
commit aa02b9c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -5,7 +5,7 @@ ENV ARCH $DAPPER_HOST_ARCH
 
 RUN zypper -n ar  https://download.opensuse.org/repositories/hardware/15.4/hardware.repo && \
     zypper -n --gpg-auto-import-keys refresh && \
-    zypper -n install bash git gcc docker vim less file curl wget ca-certificates pciutils go umockdev
+    zypper -n install bash git gcc docker vim less file curl wget ca-certificates pciutils go1.19 umockdev
 RUN go install golang.org/x/lint/golint@latest
 RUN go install golang.org/x/tools/cmd/goimports@latest
 RUN go install github.com/incu6us/goimports-reviser/v3@latest

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/harvester/pcidevices
 
-go 1.18
+go 1.19
 
 require (
 	github.com/evanphx/json-patch v5.6.0+incompatible

diff --git a/pkg/deviceplugins/device_manager.go b/pkg/deviceplugins/device_manager.go
@@ -181,7 +181,6 @@ func (dp *PCIDevicePlugin) Start(stop <-chan struct{}) (err error) {
 	}
 
 	dp.server = grpc.NewServer([]grpc.ServerOption{}...)
-	//defer dpi.stopDevicePlugin()
 
 	pluginapi.RegisterDevicePluginServer(dp.server, dp)
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	dp.server = grpc.NewServer([]grpc.ServerOption{}...)
-    	//defer dpi.stopDevicePlugin()
     	pluginapi.RegisterDevicePluginServer(dp.server, dp)
@@ Expand Down @@