Merge pull request kubernetes#126435 from bart0sh/PR151-Kubelet-devicemanager-stop-using-CDI-annotations

Kubelet: stop using CDI annotations

Author: k8s-ci-robot

pkg/kubelet/cm/devicemanager/pod_devices.go

@@ -21,13 +21,11 @@ import (
 
 	"k8s.io/klog/v2"
 
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
 	kubefeatures "k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/kubelet/cm/devicemanager/checkpoint"
-	"k8s.io/kubernetes/pkg/kubelet/cm/util/cdi"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 )
 
@@ -352,50 +350,9 @@ func (pdev *podDevices) deviceRunContainerOptions(podUID, contName string) *Devi
 		}
 	}
 
-	// Although the CDI devices are expected to be empty when this feature is disabled, we still
-	// guard this with a feature gate to avoid any potential issues.
-	if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.DevicePluginCDIDevices) {
-		// We construct a resource ID from the pod UID and container name.
-		// This ID has no semantic meaning, and is only used to ensure that the generated CDI annotation key is unique
-		// for a given container. Since this is only called once per pod-container combination, this should be the case.
-		resourceID := podUID + "-" + contName
-		cdiAnnotations := getCDIAnnotations(resourceID, allCDIDevices, annotationsMap)
-		opts.Annotations = append(opts.Annotations, cdiAnnotations...)
-	}
-
 	return opts
 }
 
-// getCDIAnnotations returns the cdi annotations for a given container.
-// This creates a CDI annotation with a key of the form: devicemanager_{{resourceID}}.
-// The value of the annotation is a comma separated list of sorted CDI device IDs.
-// If the annotation key is already defined in the provided annotations map, then the existing value is used.
-func getCDIAnnotations(resourceID string, cdiDevices sets.Set[string], annotationsMap map[string]string) []kubecontainer.Annotation {
-	// We sort the CDI devices to ensure that the annotation value is deterministic.
-	sortedCDIDevices := sets.List[string](cdiDevices)
-	annotations, err := cdi.GenerateAnnotations(types.UID(resourceID), "devicemanager", sortedCDIDevices)
-	if err != nil {
-		klog.ErrorS(err, "Failed to create CDI annotations")
-		return nil
-	}
-
-	var cdiAnnotations []kubecontainer.Annotation
-	for _, annotation := range annotations {
-		if e, ok := annotationsMap[annotation.Name]; ok {
-			klog.V(4).InfoS("Skip existing annotation", "annotationKey", annotation.Name, "annotationValue", annotation.Value)
-			if e != annotation.Value {
-				klog.ErrorS(nil, "Annotation has conflicting setting", "annotationKey", annotation.Name, "expected", e, "got", annotation.Value)
-			}
-			continue
-		}
-		klog.V(4).InfoS("Add annotation", "annotationKey", annotation.Name, "annotationValue", annotation.Value)
-		annotationsMap[annotation.Name] = annotation.Value
-		cdiAnnotations = append(cdiAnnotations, kubecontainer.Annotation{Name: annotation.Name, Value: annotation.Value})
-	}
-
-	return cdiAnnotations
-}
-
 // getCDIDeviceInfo returns CDI devices from an allocate response
 func getCDIDeviceInfo(resp *pluginapi.ContainerAllocateResponse, knownCDIDevices sets.Set[string]) []kubecontainer.CDIDevice {
 	var cdiDevices []kubecontainer.CDIDevice

pkg/kubelet/cm/devicemanager/pod_devices_test.go

@@ -183,9 +183,6 @@ func TestDeviceRunContainerOptions(t *testing.T) {
 				),
 			},
 			expected: &DeviceRunContainerOptions{
-				Annotations: []kubecontainer.Annotation{
-					{Name: "cdi.k8s.io/devicemanager_pod-container", Value: "vendor1.com/class1=device1,vendor2.com/class2=device2"},
-				},
 				CDIDevices: []kubecontainer.CDIDevice{
 					{Name: "vendor1.com/class1=device1"},
 					{Name: "vendor2.com/class2=device2"},
@@ -203,9 +200,6 @@ func TestDeviceRunContainerOptions(t *testing.T) {
 				),
 			},
 			expected: &DeviceRunContainerOptions{
-				Annotations: []kubecontainer.Annotation{
-					{Name: "cdi.k8s.io/devicemanager_pod-container", Value: "vendor1.com/class1=device1,vendor2.com/class2=device2,vendor3.com/class3=device3,vendor4.com/class4=device4"},
-				},
 				CDIDevices: []kubecontainer.CDIDevice{
 					{Name: "vendor1.com/class1=device1"},
 					{Name: "vendor2.com/class2=device2"},
@@ -225,9 +219,6 @@ func TestDeviceRunContainerOptions(t *testing.T) {
 				),
 			},
 			expected: &DeviceRunContainerOptions{
-				Annotations: []kubecontainer.Annotation{
-					{Name: "cdi.k8s.io/devicemanager_pod-container", Value: "vendor1.com/class1=device1,vendor2.com/class2=device2,vendor3.com/class3=device3"},
-				},
 				CDIDevices: []kubecontainer.CDIDevice{
 					{Name: "vendor1.com/class1=device1"},
 					{Name: "vendor2.com/class2=device2"},