877829aeaa
This adds the ability to select specific requests inside a claim for a container. NodePrepareResources is always called, even if the claim is not used by any container. This could be useful for drivers where that call has some effect other than injecting CDI device IDs into containers. It also ensures that drivers can validate configs. The pod resource API can no longer report a class for each claim because there is no such 1:1 relationship anymore. Instead, that API reports claim, API devices (with driver/pool/device as ID) and CDI device IDs. The kubelet itself doesn't extract that information from the claim. Instead, it relies on drivers to report this information when the claim gets prepared. This isolates the kubelet from API changes. Because of a faulty E2E test, kubelet was told to contact the wrong driver for a claim. This was not visible in the kubelet log output. Now changes to the claim info cache are getting logged. While at it, naming of variables and some existing log output gets harmonized. Co-authored-by: Oksana Baranova <oksana.baranova@intel.com> Co-authored-by: Ed Bartosh <eduard.bartosh@intel.com>
69 lines
2.0 KiB
Go
69 lines
2.0 KiB
Go
/*
|
|
Copyright 2023 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package state
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
|
|
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum"
|
|
)
|
|
|
|
var _ checkpointmanager.Checkpoint = &DRAManagerCheckpoint{}
|
|
|
|
const checkpointVersion = "v1"
|
|
|
|
// DRAManagerCheckpoint struct is used to store pod dynamic resources assignments in a checkpoint
|
|
type DRAManagerCheckpoint struct {
|
|
Version string `json:"version"`
|
|
Entries ClaimInfoStateList `json:"entries,omitempty"`
|
|
Checksum checksum.Checksum `json:"checksum"`
|
|
}
|
|
|
|
// List of claim info to store in checkpoint
|
|
type ClaimInfoStateList []ClaimInfoState
|
|
|
|
// NewDRAManagerCheckpoint returns an instance of Checkpoint
|
|
func NewDRAManagerCheckpoint() *DRAManagerCheckpoint {
|
|
return &DRAManagerCheckpoint{
|
|
Version: checkpointVersion,
|
|
Entries: ClaimInfoStateList{},
|
|
}
|
|
}
|
|
|
|
// MarshalCheckpoint returns marshalled checkpoint
|
|
func (dc *DRAManagerCheckpoint) MarshalCheckpoint() ([]byte, error) {
|
|
// make sure checksum wasn't set before so it doesn't affect output checksum
|
|
dc.Checksum = 0
|
|
dc.Checksum = checksum.New(dc)
|
|
return json.Marshal(*dc)
|
|
}
|
|
|
|
// UnmarshalCheckpoint tries to unmarshal passed bytes to checkpoint
|
|
func (dc *DRAManagerCheckpoint) UnmarshalCheckpoint(blob []byte) error {
|
|
return json.Unmarshal(blob, dc)
|
|
}
|
|
|
|
// VerifyChecksum verifies that current checksum of checkpoint is valid
|
|
func (dc *DRAManagerCheckpoint) VerifyChecksum() error {
|
|
ck := dc.Checksum
|
|
dc.Checksum = 0
|
|
err := ck.Verify(dc)
|
|
dc.Checksum = ck
|
|
return err
|
|
}
|