Skip to content

build(deps): bump k8s.io to 1.32.0 #1900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 2, 2025
Merged

build(deps): bump k8s.io to 1.32.0 #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e141cc
ci: move to golangci-lint v1.63.1
mythi Dec 4, 2024
93948e9
ci: run publish job on ubuntu-24.04
mythi Jan 2, 2025
2e4bdc2
deployments: update NFD to v0.17.0
mythi Dec 12, 2024
ed5d1e6
make: update controller-gen to v0.17
mythi Jan 2, 2025
6255810
gpu/rm: move to fake.NewClientSet()
mythi Dec 4, 2024
41264b3
build(deps): bump k8s.io to 1.32.0
mythi Nov 7, 2024
af44480
ci: add 1.32.x to envtest tests
mythi Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lib-validate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions cmd/gpu_levelzero/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
43 changes: 9 additions & 34 deletions cmd/gpu_plugin/rm/gpu_plugin_resource_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_acceleratorfunctions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_fpgaregions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/nfd/base/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/operator/crd/bases/deviceplugin.intel.com_dlbdeviceplugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/operator/crd/bases/deviceplugin.intel.com_iaadeviceplugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/operator/crd/bases/fpga.intel.com_acceleratorfunctions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/operator/crd/bases/fpga.intel.com_fpgaregions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading