Merge pull request #1900 from mythi/PR-2024-023

tkatila · web-flow · commit c6e809fef7d0 · 2025-01-02T13:56:24.000+02:00
build(deps): bump k8s.io to 1.32.0
diff --git a/.github/workflows/lib-validate.yaml b/.github/workflows/lib-validate.yaml
@@ -46,7 +46,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6
         with:
-          version: v1.60.3
+          version: v1.63.1
           args: -v --timeout 5m
   build:
     name: Build and check device plugins
@@ -77,9 +77,9 @@ jobs:
     strategy:
       matrix:
         version:
-          - 1.29.x
           - 1.30.x
           - 1.31.x
+          - 1.32.x
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ jobs:
 
     permissions:
       contents: write # for Git to git push
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Install dependencies
diff --git a/Makefile b/Makefile
@@ -9,8 +9,8 @@ BUILDER ?= "docker"
 EXTRA_BUILD_ARGS ?= ""
 
 CERT_MANAGER_VERSION ?= v1.15.2
-CONTROLLER_GEN_VERSION ?= v0.16.1
-GOLANGCI_LINT_VERSION ?= v1.60.3
+CONTROLLER_GEN_VERSION ?= v0.17.0
+GOLANGCI_LINT_VERSION ?= v1.63.1
 KIND_VERSION ?= v0.23.0
 GOLICENSES_VERSION ?= v1.6.0
 # Default bundle image tag
diff --git a/cmd/gpu_levelzero/main.go b/cmd/gpu_levelzero/main.go
@@ -58,11 +58,13 @@ func (s *server) GetDeviceHealth(c context.Context, deviceid *levelzero.DeviceId
 	cBdfAddress := C.CString(deviceid.BdfAddress)
 
 	memHealth := bool(C.zes_device_memory_is_healthy(cBdfAddress, (*C.uint32_t)(unsafe.Pointer(&errorVal))))
+
 	if errorVal != 0 {
 		klog.Warningf("device memory health read returned an error: 0x%X", errorVal)
 	}
 
 	busHealth := bool(C.zes_device_bus_is_healthy(cBdfAddress, (*C.uint32_t)(unsafe.Pointer(&errorVal))))
+
 	if errorVal != 0 {
 		klog.Warningf("device bus health read returned an error: 0x%X", errorVal)
 	}
@@ -93,16 +95,19 @@ func (s *server) GetDeviceTemperature(c context.Context, deviceid *levelzero.Dev
 	cBdfAddress := C.CString(deviceid.BdfAddress)
 
 	globalTemp := float64(C.zes_device_temp_max(cBdfAddress, C.CString("global"), (*C.uint32_t)(unsafe.Pointer(&errorVal))))
+
 	if errorVal != 0 {
 		klog.Warningf("global temperature read returned an error: 0x%X", errorVal)
 	}
 
 	gpuTemp := float64(C.zes_device_temp_max(cBdfAddress, C.CString("gpu"), (*C.uint32_t)(unsafe.Pointer(&errorVal))))
+
 	if errorVal != 0 {
 		klog.Warningf("gpu temperature read returned an error: 0x%X", errorVal)
 	}
 
 	memTemp := float64(C.zes_device_temp_max(cBdfAddress, C.CString("memory"), (*C.uint32_t)(unsafe.Pointer(&errorVal))))
+
 	if errorVal != 0 {
 		klog.Warningf("memory temperature read returned an error: 0x%X", errorVal)
 	}
diff --git a/cmd/gpu_plugin/rm/gpu_plugin_resource_manager_test.go b/cmd/gpu_plugin/rm/gpu_plugin_resource_manager_test.go
@@ -27,42 +27,10 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
-	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	fakecorev1 "k8s.io/client-go/kubernetes/typed/core/v1/fake"
 	"k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
 	podresourcesv1 "k8s.io/kubelet/pkg/apis/podresources/v1"
 )
 
-// mockClient implements enough of k8s API for the resource manager tests.
-type mockClient struct {
-	fake.Clientset
-	mockCoreV1
-}
-
-func (m *mockClient) CoreV1() corev1.CoreV1Interface {
-	return m
-}
-
-type mockCoreV1 struct {
-	fakecorev1.FakeCoreV1
-	mockPods
-}
-
-func (m *mockCoreV1) Pods(namespace string) corev1.PodInterface {
-	return m
-}
-
-type mockPods struct {
-	fakecorev1.FakePods
-	pods []v1.Pod
-}
-
-func (m *mockPods) List(ctx context.Context, opts metav1.ListOptions) (*v1.PodList, error) {
-	return &v1.PodList{
-		Items: m.pods,
-	}, nil
-}
-
 type mockPodResources struct {
 	pods []v1.Pod
 }
@@ -99,8 +67,15 @@ func newMockResourceManager(pods []v1.Pod) ResourceManager {
 		os.Exit(1)
 	}
 
-	mc := &mockClient{}
-	mc.mockCoreV1.mockPods.pods = pods
+	mc := fake.NewClientset()
+
+	for _, p := range pods {
+		_, err = mc.CoreV1().Pods(p.Namespace).Create(context.Background(), &p, metav1.CreateOptions{})
+		if err != nil {
+			fmt.Printf("failed to Create Pod: %v\n", err)
+		}
+	}
+
 	rm := resourceManager{
 		clientset: mc,
 		nodeName:  "TestNode",
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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   name: fpgaregions.fpga.intel.com
 spec:
   group: fpga.intel.com
diff --git a/deployments/nfd/base/kustomization.yaml b/deployments/nfd/base/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- "https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.16.4"
+- "https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.17.0"
 configMapGenerator:
 - name: nfd-worker-conf
   behavior: replace
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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   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.16.1
+    controller-gen.kubebuilder.io/version: v0.17.0
   name: fpgaregions.fpga.intel.com
 spec:
   group: fpga.intel.com
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,13 @@ func (s server) GetDeviceHealth(c context.Context, deviceid levelzero.DeviceId`
`58`	`58`	`cBdfAddress := C.CString(deviceid.BdfAddress)`
`59`	`59`
`60`	`60`	`memHealth := bool(C.zes_device_memory_is_healthy(cBdfAddress, (*C.uint32_t)(unsafe.Pointer(&errorVal))))`
	`61`	`+`
`61`	`62`	`if errorVal != 0 {`
`62`	`63`	`klog.Warningf("device memory health read returned an error: 0x%X", errorVal)`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`busHealth := bool(C.zes_device_bus_is_healthy(cBdfAddress, (*C.uint32_t)(unsafe.Pointer(&errorVal))))`
	`67`	`+`
`66`	`68`	`if errorVal != 0 {`
`67`	`69`	`klog.Warningf("device bus health read returned an error: 0x%X", errorVal)`
`68`	`70`	`}`
`@@ -93,16 +95,19 @@ func (s server) GetDeviceTemperature(c context.Context, deviceid levelzero.Dev`
`93`	`95`	`cBdfAddress := C.CString(deviceid.BdfAddress)`
`94`	`96`
`95`	`97`	`globalTemp := float64(C.zes_device_temp_max(cBdfAddress, C.CString("global"), (*C.uint32_t)(unsafe.Pointer(&errorVal))))`
	`98`	`+`
`96`	`99`	`if errorVal != 0 {`
`97`	`100`	`klog.Warningf("global temperature read returned an error: 0x%X", errorVal)`
`98`	`101`	`}`
`99`	`102`
`100`	`103`	`gpuTemp := float64(C.zes_device_temp_max(cBdfAddress, C.CString("gpu"), (*C.uint32_t)(unsafe.Pointer(&errorVal))))`
	`104`	`+`
`101`	`105`	`if errorVal != 0 {`
`102`	`106`	`klog.Warningf("gpu temperature read returned an error: 0x%X", errorVal)`
`103`	`107`	`}`
`104`	`108`
`105`	`109`	`memTemp := float64(C.zes_device_temp_max(cBdfAddress, C.CString("memory"), (*C.uint32_t)(unsafe.Pointer(&errorVal))))`
	`110`	`+`
`106`	`111`	`if errorVal != 0 {`
`107`	`112`	`klog.Warningf("memory temperature read returned an error: 0x%X", errorVal)`
`108`	`113`	`}`