Skip to content

Misc fixes for 0.36 #2292

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
mythi merged 2 commits into from
May 27, 2026
+3 −2
Merged

Misc fixes for 0.36 #2292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d43e61
gpu plugin: create monitoring without topology hints
tkatila May 26, 2026
189d47b
e2e: move to 1.36.1 k3s
tkatila May 26, 2026
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
3 changes: 2 additions & 1 deletion cmd/gpu_plugin/gpu_plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,8 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
// all Intel GPUs are under single monitoring resource per KMD
if len(monitor) > 0 {
for resourceName, devices := range monitor {
deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devices, nil, nil, nil, nil)
deviceInfo := dpapi.NewDeviceInfoWithTopologyHints(
pluginapi.Healthy, devices, nil, nil, nil, nil, nil)
devTree.AddDevice(resourceName, monitorID, deviceInfo)
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scripts/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ k3s_version_for_k8s_version() {

local known_versions

known_versions="v1.36.0-rc2+k3s1;v1.35.0+k3s1;v1.34.1+k3s1;v1.33.5+k3s1;v1.32.9+k3s1;v1.31.9+k3s1;v1.30.13+k3s1"
known_versions="v1.36.1+k3s1;v1.35.0+k3s1;v1.34.1+k3s1;v1.33.5+k3s1;v1.32.9+k3s1;v1.31.9+k3s1;v1.30.13+k3s1"

local latest
latest=$(echo $known_versions | tr ';' '\n' | grep "$requested" | head -1)
Expand Down