mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-03 03:38:15 +00:00
DRA: remove "source" indirection from v1 Pod API
This makes the API nicer:
resourceClaims:
- name: with-template
resourceClaimTemplateName: test-inline-claim-template
- name: with-claim
resourceClaimName: test-shared-claim
Previously, this was:
resourceClaims:
- name: with-template
source:
resourceClaimTemplateName: test-inline-claim-template
- name: with-claim
source:
resourceClaimName: test-shared-claim
A more long-term benefit is that other, future alternatives
might not make sense under the "source" umbrella.
This is a breaking change. It's justified because DRA is still
alpha and will have several other API breaks in 1.31.
This commit is contained in:
@@ -952,20 +952,16 @@ func generatePod(name, namespace, nodeName, svcAccountName string, opts *sampleD
|
||||
for i := 0; i < opts.uniqueResourceClaimsPerPod; i++ {
|
||||
claimName := fmt.Sprintf("claim%d-%s-%s", i, pod.Name, pod.Namespace)
|
||||
pod.Spec.ResourceClaims = append(pod.Spec.ResourceClaims, corev1.PodResourceClaim{
|
||||
Name: fmt.Sprintf("claim%d", i),
|
||||
Source: corev1.ClaimSource{
|
||||
ResourceClaimName: &claimName,
|
||||
},
|
||||
Name: fmt.Sprintf("claim%d", i),
|
||||
ResourceClaimName: &claimName,
|
||||
})
|
||||
}
|
||||
for i := 0; i < opts.uniqueResourceClaimTemplatesPerPod; i++ {
|
||||
claimTemplateName := fmt.Sprintf("claimtemplate%d-%s-%s", i, pod.Name, pod.Namespace)
|
||||
podClaimName := fmt.Sprintf("claimtemplate%d", i)
|
||||
pod.Spec.ResourceClaims = append(pod.Spec.ResourceClaims, corev1.PodResourceClaim{
|
||||
Name: podClaimName,
|
||||
Source: corev1.ClaimSource{
|
||||
ResourceClaimTemplateName: &claimTemplateName,
|
||||
},
|
||||
Name: podClaimName,
|
||||
ResourceClaimTemplateName: &claimTemplateName,
|
||||
})
|
||||
}
|
||||
for i := 0; i < opts.uniqueResourceClaimTemplatesWithClaimPerPod; i++ {
|
||||
@@ -973,10 +969,8 @@ func generatePod(name, namespace, nodeName, svcAccountName string, opts *sampleD
|
||||
podClaimName := fmt.Sprintf("claimtemplate-with-claim%d", i)
|
||||
claimName := fmt.Sprintf("generated-claim-%s-%s-%d", pod.Name, pod.Namespace, i)
|
||||
pod.Spec.ResourceClaims = append(pod.Spec.ResourceClaims, corev1.PodResourceClaim{
|
||||
Name: podClaimName,
|
||||
Source: corev1.ClaimSource{
|
||||
ResourceClaimTemplateName: &claimTemplateName,
|
||||
},
|
||||
Name: podClaimName,
|
||||
ResourceClaimTemplateName: &claimTemplateName,
|
||||
})
|
||||
pod.Status.ResourceClaimStatuses = append(pod.Status.ResourceClaimStatuses, corev1.PodResourceClaimStatus{
|
||||
Name: podClaimName,
|
||||
|
||||
Reference in New Issue
Block a user