mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-02 03:08:15 +00:00
DRA: new API for 1.31
This is a complete revamp of the original API. Some of the key differences: - refocused on structured parameters and allocating devices - support for constraints across devices - support for allocating "all" or a fixed amount of similar devices in a single request - no class for ResourceClaims, instead individual device requests are associated with a mandatory DeviceClass For the sake of simplicity, optional basic types (ints, strings) where the null value is the default are represented as values in the API types. This makes Go code simpler because it doesn't have to check for nil (consumers) and values can be set directly (producers). The effect is that in protobuf, these fields always get encoded because `opt` only has an effect for pointers. The roundtrip test data for v1.29.0 and v1.30.0 changes because of the new "request" field. This is considered acceptable because the entire `claims` field in the pod spec is still alpha. The implementation is complete enough to bring up the apiserver. Adapting other components follows.
This commit is contained in:
@@ -6757,9 +6757,35 @@ func validateResourceClaimNames(claims []core.ResourceClaim, podClaimNames sets.
|
||||
allErrs = append(allErrs, field.Required(fldPath.Index(i), ""))
|
||||
} else {
|
||||
if names.Has(name) {
|
||||
// All requests of that claim already referenced.
|
||||
allErrs = append(allErrs, field.Duplicate(fldPath.Index(i), name))
|
||||
} else {
|
||||
names.Insert(name)
|
||||
key := name
|
||||
if claim.Request != "" {
|
||||
allErrs = append(allErrs, ValidateDNS1123Label(claim.Request, fldPath.Index(i).Child("request"))...)
|
||||
key += "/" + claim.Request
|
||||
}
|
||||
if names.Has(key) {
|
||||
// The exact same entry was already referenced.
|
||||
allErrs = append(allErrs, field.Duplicate(fldPath.Index(i), key))
|
||||
} else if claim.Request == "" {
|
||||
// When referencing a claim, there's an
|
||||
// overlap when previously some request
|
||||
// in the claim was referenced. This
|
||||
// cannot be checked with a map lookup,
|
||||
// we need to iterate.
|
||||
for key := range names {
|
||||
index := strings.Index(key, "/")
|
||||
if index < 0 {
|
||||
continue
|
||||
}
|
||||
if key[0:index] == name {
|
||||
allErrs = append(allErrs, field.Duplicate(fldPath.Index(i), name))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
names.Insert(key)
|
||||
}
|
||||
if !podClaimNames.Has(name) {
|
||||
// field.NotFound doesn't accept an
|
||||
|
||||
@@ -23816,6 +23816,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
|
||||
shortPodName := &metav1.ObjectMeta{
|
||||
Name: "some-pod",
|
||||
}
|
||||
requestName := "req-0"
|
||||
anotherRequestName := "req-1"
|
||||
goodClaimTemplate := podtest.MakePod("",
|
||||
podtest.SetContainers(podtest.MakeContainer("ctr", podtest.SetContainerResources(core.ResourceRequirements{Claims: []core.ResourceClaim{{Name: "my-claim-template"}}}))),
|
||||
podtest.SetRestartPolicy(core.RestartPolicyAlways),
|
||||
@@ -23848,6 +23850,26 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
|
||||
ResourceClaimName: &externalClaimName,
|
||||
}),
|
||||
),
|
||||
"multiple claims with requests": podtest.MakePod("",
|
||||
podtest.SetContainers(podtest.MakeContainer("ctr", podtest.SetContainerResources(core.ResourceRequirements{Claims: []core.ResourceClaim{{Name: "my-claim", Request: requestName}, {Name: "another-claim", Request: requestName}}}))),
|
||||
podtest.SetResourceClaims(
|
||||
core.PodResourceClaim{
|
||||
Name: "my-claim",
|
||||
ResourceClaimName: &externalClaimName,
|
||||
},
|
||||
core.PodResourceClaim{
|
||||
Name: "another-claim",
|
||||
ResourceClaimName: &externalClaimName,
|
||||
}),
|
||||
),
|
||||
"single claim with requests": podtest.MakePod("",
|
||||
podtest.SetContainers(podtest.MakeContainer("ctr", podtest.SetContainerResources(core.ResourceRequirements{Claims: []core.ResourceClaim{{Name: "my-claim", Request: requestName}, {Name: "my-claim", Request: anotherRequestName}}}))),
|
||||
podtest.SetResourceClaims(
|
||||
core.PodResourceClaim{
|
||||
Name: "my-claim",
|
||||
ResourceClaimName: &externalClaimName,
|
||||
}),
|
||||
),
|
||||
"init container": podtest.MakePod("",
|
||||
podtest.SetInitContainers(podtest.MakeContainer("ctr-init", podtest.SetContainerResources(core.ResourceRequirements{Claims: []core.ResourceClaim{{Name: "my-claim"}}}))),
|
||||
podtest.SetResourceClaims(core.PodResourceClaim{
|
||||
@@ -23928,6 +23950,34 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
|
||||
ResourceClaimName: &externalClaimName,
|
||||
}),
|
||||
),
|
||||
"pod claim name duplicates without and with request": podtest.MakePod("",
|
||||
podtest.SetContainers(podtest.MakeContainer("ctr", podtest.SetContainerResources(core.ResourceRequirements{Claims: []core.ResourceClaim{{Name: "my-claim"}, {Name: "my-claim", Request: "req-0"}}}))),
|
||||
podtest.SetResourceClaims(core.PodResourceClaim{
|
||||
Name: "my-claim",
|
||||
ResourceClaimName: &externalClaimName,
|
||||
}),
|
||||
),
|
||||
"pod claim name duplicates with and without request": podtest.MakePod("",
|
||||
podtest.SetContainers(podtest.MakeContainer("ctr", podtest.SetContainerResources(core.ResourceRequirements{Claims: []core.ResourceClaim{{Name: "my-claim", Request: "req-0"}, {Name: "my-claim"}}}))),
|
||||
podtest.SetResourceClaims(core.PodResourceClaim{
|
||||
Name: "my-claim",
|
||||
ResourceClaimName: &externalClaimName,
|
||||
}),
|
||||
),
|
||||
"pod claim name duplicates with requests": podtest.MakePod("",
|
||||
podtest.SetContainers(podtest.MakeContainer("ctr", podtest.SetContainerResources(core.ResourceRequirements{Claims: []core.ResourceClaim{{Name: "my-claim", Request: "req-0"}, {Name: "my-claim", Request: "req-0"}}}))),
|
||||
podtest.SetResourceClaims(core.PodResourceClaim{
|
||||
Name: "my-claim",
|
||||
ResourceClaimName: &externalClaimName,
|
||||
}),
|
||||
),
|
||||
"bad request name": podtest.MakePod("",
|
||||
podtest.SetContainers(podtest.MakeContainer("ctr", podtest.SetContainerResources(core.ResourceRequirements{Claims: []core.ResourceClaim{{Name: "my-claim", Request: "*$@%^"}}}))),
|
||||
podtest.SetResourceClaims(core.PodResourceClaim{
|
||||
Name: "my-claim",
|
||||
ResourceClaimName: &externalClaimName,
|
||||
}),
|
||||
),
|
||||
"no claims defined": podtest.MakePod("",
|
||||
podtest.SetContainers(podtest.MakeContainer("ctr", podtest.SetContainerResources(core.ResourceRequirements{Claims: []core.ResourceClaim{{Name: "my-claim"}}}))),
|
||||
podtest.SetRestartPolicy(core.RestartPolicyAlways),
|
||||
|
||||
Reference in New Issue
Block a user