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.

api/openapi-spec/swagger.json

@@ -5813,20 +5813,6 @@
       ],
       "type": "object"
     },
-    "io.k8s.api.core.v1.ClaimSource": {
-      "description": "ClaimSource describes a reference to a ResourceClaim.\n\nExactly one of these fields should be set.  Consumers of this type must treat an empty object as if it has an unknown value.",
-      "properties": {
-        "resourceClaimName": {
-          "description": "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.",
-          "type": "string"
-        },
-        "resourceClaimTemplateName": {
-          "description": "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.",
-          "type": "string"
-        }
-      },
-      "type": "object"
-    },
     "io.k8s.api.core.v1.ClientIPConfig": {
       "description": "ClientIPConfig represents the configurations of Client IP based session affinity.",
       "properties": {
@@ -9371,15 +9357,19 @@
       "type": "object"
     },
     "io.k8s.api.core.v1.PodResourceClaim": {
-      "description": "PodResourceClaim references exactly one ResourceClaim through a ClaimSource. It adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
+      "description": "PodResourceClaim references exactly one ResourceClaim, either directly or by naming a ResourceClaimTemplate which is then turned into a ResourceClaim for the pod.\n\nIt adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
       "properties": {
         "name": {
           "description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.",
           "type": "string"
         },
-        "source": {
+        "resourceClaimName": {
-          "$ref": "#/definitions/io.k8s.api.core.v1.ClaimSource",
+          "description": "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
-          "description": "Source describes where to find the ResourceClaim."
+          "type": "string"
+        },
+        "resourceClaimTemplateName": {
+          "description": "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
+          "type": "string"
         }
       },
       "required": [

api/openapi-spec/v3/api__v1_openapi.json

@@ -721,20 +721,6 @@
         ],
         "type": "object"
       },
-      "io.k8s.api.core.v1.ClaimSource": {
-        "description": "ClaimSource describes a reference to a ResourceClaim.\n\nExactly one of these fields should be set.  Consumers of this type must treat an empty object as if it has an unknown value.",
-        "properties": {
-          "resourceClaimName": {
-            "description": "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.",
-            "type": "string"
-          },
-          "resourceClaimTemplateName": {
-            "description": "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.",
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
       "io.k8s.api.core.v1.ClientIPConfig": {
         "description": "ClientIPConfig represents the configurations of Client IP based session affinity.",
         "properties": {
@@ -5253,21 +5239,20 @@
         "type": "object"
       },
       "io.k8s.api.core.v1.PodResourceClaim": {
-        "description": "PodResourceClaim references exactly one ResourceClaim through a ClaimSource. It adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
+        "description": "PodResourceClaim references exactly one ResourceClaim, either directly or by naming a ResourceClaimTemplate which is then turned into a ResourceClaim for the pod.\n\nIt adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
         "properties": {
           "name": {
             "default": "",
             "description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.",
             "type": "string"
           },
-          "source": {
+          "resourceClaimName": {
-            "allOf": [
+            "description": "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
-              {
+            "type": "string"
-                "$ref": "#/components/schemas/io.k8s.api.core.v1.ClaimSource"
+          },
-              }
+          "resourceClaimTemplateName": {
-            ],
+            "description": "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
-            "default": {},
+            "type": "string"
-            "description": "Source describes where to find the ResourceClaim."
           }
         },
         "required": [

api/openapi-spec/v3/apis__apps__v1_openapi.json

@@ -1611,20 +1611,6 @@
         ],
         "type": "object"
       },
-      "io.k8s.api.core.v1.ClaimSource": {
-        "description": "ClaimSource describes a reference to a ResourceClaim.\n\nExactly one of these fields should be set.  Consumers of this type must treat an empty object as if it has an unknown value.",
-        "properties": {
-          "resourceClaimName": {
-            "description": "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.",
-            "type": "string"
-          },
-          "resourceClaimTemplateName": {
-            "description": "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.",
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
       "io.k8s.api.core.v1.ClusterTrustBundleProjection": {
         "description": "ClusterTrustBundleProjection describes how to select a set of ClusterTrustBundle objects and project their contents into the pod filesystem.",
         "properties": {
@@ -3574,21 +3560,20 @@
         "type": "object"
       },
       "io.k8s.api.core.v1.PodResourceClaim": {
-        "description": "PodResourceClaim references exactly one ResourceClaim through a ClaimSource. It adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
+        "description": "PodResourceClaim references exactly one ResourceClaim, either directly or by naming a ResourceClaimTemplate which is then turned into a ResourceClaim for the pod.\n\nIt adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
         "properties": {
           "name": {
             "default": "",
             "description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.",
             "type": "string"
           },
-          "source": {
+          "resourceClaimName": {
-            "allOf": [
+            "description": "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
-              {
+            "type": "string"
-                "$ref": "#/components/schemas/io.k8s.api.core.v1.ClaimSource"
+          },
-              }
+          "resourceClaimTemplateName": {
-            ],
+            "description": "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
-            "default": {},
+            "type": "string"
-            "description": "Source describes where to find the ResourceClaim."
           }
         },
         "required": [

api/openapi-spec/v3/apis__batch__v1_openapi.json

@@ -960,20 +960,6 @@
         ],
         "type": "object"
       },
-      "io.k8s.api.core.v1.ClaimSource": {
-        "description": "ClaimSource describes a reference to a ResourceClaim.\n\nExactly one of these fields should be set.  Consumers of this type must treat an empty object as if it has an unknown value.",
-        "properties": {
-          "resourceClaimName": {
-            "description": "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.",
-            "type": "string"
-          },
-          "resourceClaimTemplateName": {
-            "description": "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.",
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
       "io.k8s.api.core.v1.ClusterTrustBundleProjection": {
         "description": "ClusterTrustBundleProjection describes how to select a set of ClusterTrustBundle objects and project their contents into the pod filesystem.",
         "properties": {
@@ -2778,21 +2764,20 @@
         "type": "object"
       },
       "io.k8s.api.core.v1.PodResourceClaim": {
-        "description": "PodResourceClaim references exactly one ResourceClaim through a ClaimSource. It adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
+        "description": "PodResourceClaim references exactly one ResourceClaim, either directly or by naming a ResourceClaimTemplate which is then turned into a ResourceClaim for the pod.\n\nIt adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
         "properties": {
           "name": {
             "default": "",
             "description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.",
             "type": "string"
           },
-          "source": {
+          "resourceClaimName": {
-            "allOf": [
+            "description": "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
-              {
+            "type": "string"
-                "$ref": "#/components/schemas/io.k8s.api.core.v1.ClaimSource"
+          },
-              }
+          "resourceClaimTemplateName": {
-            ],
+            "description": "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
-            "default": {},
+            "type": "string"
-            "description": "Source describes where to find the ResourceClaim."
           }
         },
         "required": [

pkg/api/pod/util_test.go

@@ -842,12 +842,10 @@ func TestDropDynamicResourceAllocation(t *testing.T) {
 			ResourceClaims: []api.PodResourceClaim{
 				{
 					Name:              "my-claim",
-					Source: api.ClaimSource{
 					ResourceClaimName: &resourceClaimName,
 				},
 			},
 		},
-		},
 		Status: api.PodStatus{
 			ResourceClaimStatuses: []api.PodResourceClaimStatus{
 				{Name: "my-claim", ResourceClaimName: pointer.String("pod-my-claim")},

pkg/apis/core/types.go

@@ -3476,17 +3476,11 @@ type PodResourceClaim struct {
 	// This must be a DNS_LABEL.
 	Name string
 
-	// Source describes where to find the ResourceClaim.
-	Source ClaimSource
-}
-
-// ClaimSource describes a reference to a ResourceClaim.
-//
-// Exactly one of these fields should be set.  Consumers of this type must
-// treat an empty object as if it has an unknown value.
-type ClaimSource struct {
 	// ResourceClaimName is the name of a ResourceClaim object in the same
 	// namespace as this pod.
+	//
+	// Exactly one of ResourceClaimName and ResourceClaimTemplateName must
+	// be set.
 	ResourceClaimName *string
 
 	// ResourceClaimTemplateName is the name of a ResourceClaimTemplate
@@ -3501,6 +3495,9 @@ type ClaimSource struct {
 	// This field is immutable and no changes will be made to the
 	// corresponding ResourceClaim by the control plane after creating the
 	// ResourceClaim.
+	//
+	// Exactly one of ResourceClaimName and ResourceClaimTemplateName must
+	// be set.
 	ResourceClaimTemplateName *string
 }
 

pkg/apis/core/v1/zz_generated.conversion.go

@@ -202,16 +202,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*v1.ClaimSource)(nil), (*core.ClaimSource)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1_ClaimSource_To_core_ClaimSource(a.(*v1.ClaimSource), b.(*core.ClaimSource), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*core.ClaimSource)(nil), (*v1.ClaimSource)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_core_ClaimSource_To_v1_ClaimSource(a.(*core.ClaimSource), b.(*v1.ClaimSource), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddGeneratedConversionFunc((*v1.ClientIPConfig)(nil), (*core.ClientIPConfig)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_v1_ClientIPConfig_To_core_ClientIPConfig(a.(*v1.ClientIPConfig), b.(*core.ClientIPConfig), scope)
 	}); err != nil {
@@ -2805,28 +2795,6 @@ func Convert_core_CinderVolumeSource_To_v1_CinderVolumeSource(in *core.CinderVol
 	return autoConvert_core_CinderVolumeSource_To_v1_CinderVolumeSource(in, out, s)
 }
 
-func autoConvert_v1_ClaimSource_To_core_ClaimSource(in *v1.ClaimSource, out *core.ClaimSource, s conversion.Scope) error {
-	out.ResourceClaimName = (*string)(unsafe.Pointer(in.ResourceClaimName))
-	out.ResourceClaimTemplateName = (*string)(unsafe.Pointer(in.ResourceClaimTemplateName))
-	return nil
-}
-
-// Convert_v1_ClaimSource_To_core_ClaimSource is an autogenerated conversion function.
-func Convert_v1_ClaimSource_To_core_ClaimSource(in *v1.ClaimSource, out *core.ClaimSource, s conversion.Scope) error {
-	return autoConvert_v1_ClaimSource_To_core_ClaimSource(in, out, s)
-}
-
-func autoConvert_core_ClaimSource_To_v1_ClaimSource(in *core.ClaimSource, out *v1.ClaimSource, s conversion.Scope) error {
-	out.ResourceClaimName = (*string)(unsafe.Pointer(in.ResourceClaimName))
-	out.ResourceClaimTemplateName = (*string)(unsafe.Pointer(in.ResourceClaimTemplateName))
-	return nil
-}
-
-// Convert_core_ClaimSource_To_v1_ClaimSource is an autogenerated conversion function.
-func Convert_core_ClaimSource_To_v1_ClaimSource(in *core.ClaimSource, out *v1.ClaimSource, s conversion.Scope) error {
-	return autoConvert_core_ClaimSource_To_v1_ClaimSource(in, out, s)
-}
-
 func autoConvert_v1_ClientIPConfig_To_core_ClientIPConfig(in *v1.ClientIPConfig, out *core.ClientIPConfig, s conversion.Scope) error {
 	out.TimeoutSeconds = (*int32)(unsafe.Pointer(in.TimeoutSeconds))
 	return nil
@@ -6489,9 +6457,8 @@ func Convert_core_PodReadinessGate_To_v1_PodReadinessGate(in *core.PodReadinessG
 
 func autoConvert_v1_PodResourceClaim_To_core_PodResourceClaim(in *v1.PodResourceClaim, out *core.PodResourceClaim, s conversion.Scope) error {
 	out.Name = in.Name
-	if err := Convert_v1_ClaimSource_To_core_ClaimSource(&in.Source, &out.Source, s); err != nil {
+	out.ResourceClaimName = (*string)(unsafe.Pointer(in.ResourceClaimName))
-		return err
+	out.ResourceClaimTemplateName = (*string)(unsafe.Pointer(in.ResourceClaimTemplateName))
-	}
 	return nil
 }
 
@@ -6502,9 +6469,8 @@ func Convert_v1_PodResourceClaim_To_core_PodResourceClaim(in *v1.PodResourceClai
 
 func autoConvert_core_PodResourceClaim_To_v1_PodResourceClaim(in *core.PodResourceClaim, out *v1.PodResourceClaim, s conversion.Scope) error {
 	out.Name = in.Name
-	if err := Convert_core_ClaimSource_To_v1_ClaimSource(&in.Source, &out.Source, s); err != nil {
+	out.ResourceClaimName = (*string)(unsafe.Pointer(in.ResourceClaimName))
-		return err
+	out.ResourceClaimTemplateName = (*string)(unsafe.Pointer(in.ResourceClaimTemplateName))
-	}
 	return nil
 }
 

pkg/apis/core/validation/validation.go

@@ -3020,7 +3020,7 @@ func validatePodResourceClaim(podMeta *metav1.ObjectMeta, claim core.PodResource
 		nameErrs := ValidateDNS1123Label(claim.Name, fldPath.Child("name"))
 		if len(nameErrs) > 0 {
 			allErrs = append(allErrs, nameErrs...)
-		} else if podMeta != nil && claim.Source.ResourceClaimTemplateName != nil {
+		} else if podMeta != nil && claim.ResourceClaimTemplateName != nil {
 			claimName := podMeta.Name + "-" + claim.Name
 			for _, detail := range ValidateResourceClaimName(claimName, false) {
 				allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), claimName, "final ResourceClaim name: "+detail))
@@ -3028,27 +3028,20 @@ func validatePodResourceClaim(podMeta *metav1.ObjectMeta, claim core.PodResource
 		}
 		podClaimNames.Insert(claim.Name)
 	}
-	allErrs = append(allErrs, validatePodResourceClaimSource(claim.Source, fldPath.Child("source"))...)
+	if claim.ResourceClaimName != nil && claim.ResourceClaimTemplateName != nil {
-
+		allErrs = append(allErrs, field.Invalid(fldPath, claim, "at most one of `resourceClaimName` or `resourceClaimTemplateName` may be specified"))
-	return allErrs
-}
-
-func validatePodResourceClaimSource(claimSource core.ClaimSource, fldPath *field.Path) field.ErrorList {
-	var allErrs field.ErrorList
-	if claimSource.ResourceClaimName != nil && claimSource.ResourceClaimTemplateName != nil {
-		allErrs = append(allErrs, field.Invalid(fldPath, claimSource, "at most one of `resourceClaimName` or `resourceClaimTemplateName` may be specified"))
 	}
-	if claimSource.ResourceClaimName == nil && claimSource.ResourceClaimTemplateName == nil {
+	if claim.ResourceClaimName == nil && claim.ResourceClaimTemplateName == nil {
-		allErrs = append(allErrs, field.Invalid(fldPath, claimSource, "must specify one of: `resourceClaimName`, `resourceClaimTemplateName`"))
+		allErrs = append(allErrs, field.Invalid(fldPath, claim, "must specify one of: `resourceClaimName`, `resourceClaimTemplateName`"))
 	}
-	if claimSource.ResourceClaimName != nil {
+	if claim.ResourceClaimName != nil {
-		for _, detail := range ValidateResourceClaimName(*claimSource.ResourceClaimName, false) {
+		for _, detail := range ValidateResourceClaimName(*claim.ResourceClaimName, false) {
-			allErrs = append(allErrs, field.Invalid(fldPath.Child("resourceClaimName"), *claimSource.ResourceClaimName, detail))
+			allErrs = append(allErrs, field.Invalid(fldPath.Child("resourceClaimName"), *claim.ResourceClaimName, detail))
 		}
 	}
-	if claimSource.ResourceClaimTemplateName != nil {
+	if claim.ResourceClaimTemplateName != nil {
-		for _, detail := range ValidateResourceClaimTemplateName(*claimSource.ResourceClaimTemplateName, false) {
+		for _, detail := range ValidateResourceClaimTemplateName(*claim.ResourceClaimTemplateName, false) {
-			allErrs = append(allErrs, field.Invalid(fldPath.Child("resourceClaimTemplateName"), *claimSource.ResourceClaimTemplateName, detail))
+			allErrs = append(allErrs, field.Invalid(fldPath.Child("resourceClaimTemplateName"), *claim.ResourceClaimTemplateName, detail))
 		}
 	}
 	return allErrs

pkg/apis/core/validation/validation_test.go

@@ -22650,8 +22650,8 @@ func TestValidateOSFields(t *testing.T) {
 		"PriorityClassName",
 		"ReadinessGates",
 		"ResourceClaims[*].Name",
-		"ResourceClaims[*].Source.ResourceClaimName",
+		"ResourceClaims[*].ResourceClaimName",
-		"ResourceClaims[*].Source.ResourceClaimTemplateName",
+		"ResourceClaims[*].ResourceClaimTemplateName",
 		"RestartPolicy",
 		"RuntimeClassName",
 		"SchedulerName",
@@ -25857,9 +25857,6 @@ func TestValidatePVSecretReference(t *testing.T) {
 func TestValidateDynamicResourceAllocation(t *testing.T) {
 	externalClaimName := "some-claim"
 	externalClaimTemplateName := "some-claim-template"
-	goodClaimSource := core.ClaimSource{
-		ResourceClaimName: &externalClaimName,
-	}
 	shortPodName := &metav1.ObjectMeta{
 		Name: "some-pod",
 	}
@@ -25872,9 +25869,7 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 		DNSPolicy:     core.DNSClusterFirst,
 		ResourceClaims: []core.PodResourceClaim{{
 			Name:                      "my-claim-template",
-			Source: core.ClaimSource{
 			ResourceClaimTemplateName: &externalClaimTemplateName,
-			},
 		}},
 	}
 	goodClaimReference := core.PodSpec{
@@ -25883,9 +25878,7 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 		DNSPolicy:     core.DNSClusterFirst,
 		ResourceClaims: []core.PodResourceClaim{{
 			Name:              "my-claim-reference",
-			Source: core.ClaimSource{
 			ResourceClaimName: &externalClaimName,
-			},
 		}},
 	}
 
@@ -25898,10 +25891,10 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}, {
 				Name:              "another-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 		"init container": {
@@ -25911,7 +25904,7 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:      core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 	}
@@ -25930,7 +25923,7 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "../my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 		"pod claim name with path": {
@@ -25939,7 +25932,7 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "my/claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 		"pod claim name empty": {
@@ -25948,7 +25941,7 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 		"duplicate pod claim entries": {
@@ -25957,10 +25950,10 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}, {
 				Name:              "my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 		"resource claim source empty": {
@@ -25969,7 +25962,6 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name: "my-claim",
-				Source: core.ClaimSource{},
 			}},
 		},
 		"resource claim reference and template": {
@@ -25978,10 +25970,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:                      "my-claim",
-				Source: core.ClaimSource{
 				ResourceClaimName:         &externalClaimName,
 				ResourceClaimTemplateName: &externalClaimTemplateName,
-				},
 			}},
 		},
 		"claim not found": {
@@ -25990,7 +25980,7 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 		"claim name empty": {
@@ -25999,7 +25989,7 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 		"pod claim name duplicates": {
@@ -26008,7 +25998,7 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 		"no claims defined": {
@@ -26022,10 +26012,10 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:     core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}, {
 				Name:              "my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 		"ephemeral container don't support resource requirements": {
@@ -26035,19 +26025,19 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
 			DNSPolicy:           core.DNSClusterFirst,
 			ResourceClaims: []core.PodResourceClaim{{
 				Name:              "my-claim",
-				Source: goodClaimSource,
+				ResourceClaimName: &externalClaimName,
 			}},
 		},
 		"invalid claim template name": func() core.PodSpec {
 			spec := goodClaimTemplate.DeepCopy()
 			notLabel := ".foo_bar"
-			spec.ResourceClaims[0].Source.ResourceClaimTemplateName = &notLabel
+			spec.ResourceClaims[0].ResourceClaimTemplateName = &notLabel
 			return *spec
 		}(),
 		"invalid claim reference name": func() core.PodSpec {
 			spec := goodClaimReference.DeepCopy()
 			notLabel := ".foo_bar"
-			spec.ResourceClaims[0].Source.ResourceClaimName = &notLabel
+			spec.ResourceClaims[0].ResourceClaimName = &notLabel
 			return *spec
 		}(),
 	}

pkg/apis/core/zz_generated.deepcopy.go

@@ -440,32 +440,6 @@ func (in *CinderVolumeSource) DeepCopy() *CinderVolumeSource {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClaimSource) DeepCopyInto(out *ClaimSource) {
-	*out = *in
-	if in.ResourceClaimName != nil {
-		in, out := &in.ResourceClaimName, &out.ResourceClaimName
-		*out = new(string)
-		**out = **in
-	}
-	if in.ResourceClaimTemplateName != nil {
-		in, out := &in.ResourceClaimTemplateName, &out.ResourceClaimTemplateName
-		*out = new(string)
-		**out = **in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClaimSource.
-func (in *ClaimSource) DeepCopy() *ClaimSource {
-	if in == nil {
-		return nil
-	}
-	out := new(ClaimSource)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClientIPConfig) DeepCopyInto(out *ClientIPConfig) {
 	*out = *in
@@ -4020,7 +3994,16 @@ func (in *PodReadinessGate) DeepCopy() *PodReadinessGate {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PodResourceClaim) DeepCopyInto(out *PodResourceClaim) {
 	*out = *in
-	in.Source.DeepCopyInto(&out.Source)
+	if in.ResourceClaimName != nil {
+		in, out := &in.ResourceClaimName, &out.ResourceClaimName
+		*out = new(string)
+		**out = **in
+	}
+	if in.ResourceClaimTemplateName != nil {
+		in, out := &in.ResourceClaimTemplateName, &out.ResourceClaimTemplateName
+		*out = new(string)
+		**out = **in
+	}
 	return
 }
 

pkg/controller/resourceclaim/controller.go

@@ -297,7 +297,7 @@ func (ec *Controller) podNeedsWork(pod *v1.Pod) (bool, string) {
 		}
 		claim, err := ec.claimLister.ResourceClaims(pod.Namespace).Get(*claimName)
 		if apierrors.IsNotFound(err) {
-			if podClaim.Source.ResourceClaimTemplateName != nil {
+			if podClaim.ResourceClaimTemplateName != nil {
 				return true, "must create ResourceClaim from template"
 			}
 			// User needs to create claim.
@@ -592,7 +592,7 @@ func (ec *Controller) handleClaim(ctx context.Context, pod *v1.Pod, podClaim v1.
 		}
 	}
 
-	templateName := podClaim.Source.ResourceClaimTemplateName
+	templateName := podClaim.ResourceClaimTemplateName
 	if templateName == nil {
 		// Nothing to do.
 		return nil

pkg/controller/resourceclaim/controller_test.go

@@ -648,9 +648,7 @@ func reserveClaim(claim *resourcev1alpha2.ResourceClaim, pod *v1.Pod) *resourcev
 func makePodResourceClaim(name, templateName string) *v1.PodResourceClaim {
 	return &v1.PodResourceClaim{
 		Name:                      name,
-		Source: v1.ClaimSource{
 		ResourceClaimTemplateName: &templateName,
-		},
 	}
 }
 

pkg/generated/openapi/zz_generated.openapi.go

@@ -392,7 +392,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 		"k8s.io/api/core/v1.CephFSVolumeSource":                                                                 schema_k8sio_api_core_v1_CephFSVolumeSource(ref),
 		"k8s.io/api/core/v1.CinderPersistentVolumeSource":                                                       schema_k8sio_api_core_v1_CinderPersistentVolumeSource(ref),
 		"k8s.io/api/core/v1.CinderVolumeSource":                                                                 schema_k8sio_api_core_v1_CinderVolumeSource(ref),
-		"k8s.io/api/core/v1.ClaimSource":                                                                        schema_k8sio_api_core_v1_ClaimSource(ref),
 		"k8s.io/api/core/v1.ClientIPConfig":                                                                     schema_k8sio_api_core_v1_ClientIPConfig(ref),
 		"k8s.io/api/core/v1.ClusterTrustBundleProjection":                                                       schema_k8sio_api_core_v1_ClusterTrustBundleProjection(ref),
 		"k8s.io/api/core/v1.ComponentCondition":                                                                 schema_k8sio_api_core_v1_ComponentCondition(ref),
@@ -19701,33 +19700,6 @@ func schema_k8sio_api_core_v1_CinderVolumeSource(ref common.ReferenceCallback) c
 	}
 }
 
-func schema_k8sio_api_core_v1_ClaimSource(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "ClaimSource describes a reference to a ResourceClaim.\n\nExactly one of these fields should be set.  Consumers of this type must treat an empty object as if it has an unknown value.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"resourceClaimName": {
-						SchemaProps: spec.SchemaProps{
-							Description: "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"resourceClaimTemplateName": {
-						SchemaProps: spec.SchemaProps{
-							Description: "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
 func schema_k8sio_api_core_v1_ClientIPConfig(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
@@ -27038,7 +27010,7 @@ func schema_k8sio_api_core_v1_PodResourceClaim(ref common.ReferenceCallback) com
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Description: "PodResourceClaim references exactly one ResourceClaim through a ClaimSource. It adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
+				Description: "PodResourceClaim references exactly one ResourceClaim, either directly or by naming a ResourceClaimTemplate which is then turned into a ResourceClaim for the pod.\n\nIt adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
 				Type:        []string{"object"},
 				Properties: map[string]spec.Schema{
 					"name": {
@@ -27049,19 +27021,24 @@ func schema_k8sio_api_core_v1_PodResourceClaim(ref common.ReferenceCallback) com
 							Format:      "",
 						},
 					},
-					"source": {
+					"resourceClaimName": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Source describes where to find the ResourceClaim.",
+							Description: "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
-							Default:     map[string]interface{}{},
+							Type:        []string{"string"},
-							Ref:         ref("k8s.io/api/core/v1.ClaimSource"),
+							Format:      "",
+						},
+					},
+					"resourceClaimTemplateName": {
+						SchemaProps: spec.SchemaProps{
+							Description: "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
+							Type:        []string{"string"},
+							Format:      "",
 						},
 					},
 				},
 				Required: []string{"name"},
 			},
 		},
-		Dependencies: []string{
-			"k8s.io/api/core/v1.ClaimSource"},
 	}
 }
 

pkg/kubelet/cm/dra/manager_test.go

@@ -225,7 +225,7 @@ func TestGetResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name:              "test-pod-claim-1",
-							Source: v1.ClaimSource{ResourceClaimName: &resourceClaimName},
+							ResourceClaimName: &resourceClaimName,
 						},
 					},
 				},
@@ -269,7 +269,7 @@ func TestGetResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name:              "test-pod-claim-1",
-							Source: v1.ClaimSource{ResourceClaimName: &resourceClaimName},
+							ResourceClaimName: &resourceClaimName,
 						},
 					},
 				},
@@ -365,7 +365,7 @@ func TestPrepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-0",
-							Source: v1.ClaimSource{
+
 							ResourceClaimName: func() *string {
 								s := "test-pod-claim-0"
 								return &s
@@ -374,7 +374,6 @@ func TestPrepareResources(t *testing.T) {
 					},
 				},
 			},
-			},
 			wantErr: true,
 		},
 		{
@@ -390,14 +389,12 @@ func TestPrepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-1",
-							Source: v1.ClaimSource{
 							ResourceClaimName: func() *string {
 								s := "test-pod-claim-1"
 								return &s
 							}(),
 						},
 					},
-					},
 					Containers: []v1.Container{
 						{
 							Resources: v1.ResourceRequirements{
@@ -447,14 +444,12 @@ func TestPrepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-nil",
-							Source: v1.ClaimSource{
 							ResourceClaimName: func() *string {
 								s := "test-pod-claim-nil"
 								return &s
 							}(),
 						},
 					},
-					},
 					Containers: []v1.Container{
 						{
 							Resources: v1.ResourceRequirements{
@@ -506,14 +501,12 @@ func TestPrepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-empty",
-							Source: v1.ClaimSource{
 							ResourceClaimName: func() *string {
 								s := "test-pod-claim-empty"
 								return &s
 							}(),
 						},
 					},
-					},
 					Containers: []v1.Container{
 						{
 							Resources: v1.ResourceRequirements{
@@ -565,7 +558,6 @@ func TestPrepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-2",
-							Source: v1.ClaimSource{
 							ResourceClaimName: func() *string {
 								s := "test-pod-claim-2"
 								return &s
@@ -574,7 +566,6 @@ func TestPrepareResources(t *testing.T) {
 					},
 				},
 			},
-			},
 			resourceClaim: &resourcev1alpha2.ResourceClaim{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-pod-claim-2",
@@ -608,10 +599,10 @@ func TestPrepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-3",
-							Source: v1.ClaimSource{ResourceClaimName: func() *string {
+							ResourceClaimName: func() *string {
 								s := "test-pod-claim-3"
 								return &s
-							}()},
+							}(),
 						},
 					},
 				},
@@ -652,10 +643,10 @@ func TestPrepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-4",
-							Source: v1.ClaimSource{ResourceClaimName: func() *string {
+							ResourceClaimName: func() *string {
 								s := "test-pod-claim-4"
 								return &s
-							}()},
+							}(),
 						},
 					},
 					Containers: []v1.Container{
@@ -717,10 +708,10 @@ func TestPrepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-5",
-							Source: v1.ClaimSource{ResourceClaimName: func() *string {
+							ResourceClaimName: func() *string {
 								s := "test-pod-claim-5"
 								return &s
-							}()},
+							}(),
 						},
 					},
 					Containers: []v1.Container{
@@ -779,10 +770,10 @@ func TestPrepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-6",
-							Source: v1.ClaimSource{ResourceClaimName: func() *string {
+							ResourceClaimName: func() *string {
 								s := "test-pod-claim-6"
 								return &s
-							}()},
+							}(),
 						},
 					},
 					Containers: []v1.Container{
@@ -840,10 +831,10 @@ func TestPrepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim",
-							Source: v1.ClaimSource{ResourceClaimName: func() *string {
+							ResourceClaimName: func() *string {
 								s := "test-pod-claim"
 								return &s
-							}()},
+							}(),
 						},
 					},
 					Containers: []v1.Container{
@@ -1005,14 +996,12 @@ func TestUnprepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "another-claim-test",
-							Source: v1.ClaimSource{
 							ResourceClaimName: func() *string {
 								s := "another-claim-test"
 								return &s
 							}(),
 						},
 					},
-					},
 					Containers: []v1.Container{
 						{
 							Resources: v1.ResourceRequirements{
@@ -1054,10 +1043,10 @@ func TestUnprepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-1",
-							Source: v1.ClaimSource{ResourceClaimName: func() *string {
+							ResourceClaimName: func() *string {
 								s := "test-pod-claim-1"
 								return &s
-							}()},
+							}(),
 						},
 					},
 					Containers: []v1.Container{
@@ -1096,10 +1085,10 @@ func TestUnprepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-2",
-							Source: v1.ClaimSource{ResourceClaimName: func() *string {
+							ResourceClaimName: func() *string {
 								s := "test-pod-claim-2"
 								return &s
-							}()},
+							}(),
 						},
 					},
 					Containers: []v1.Container{
@@ -1146,10 +1135,10 @@ func TestUnprepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-3",
-							Source: v1.ClaimSource{ResourceClaimName: func() *string {
+							ResourceClaimName: func() *string {
 								s := "test-pod-claim-3"
 								return &s
-							}()},
+							}(),
 						},
 					},
 					Containers: []v1.Container{
@@ -1195,10 +1184,10 @@ func TestUnprepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim",
-							Source: v1.ClaimSource{ResourceClaimName: func() *string {
+							ResourceClaimName: func() *string {
 								s := "test-pod-claim"
 								return &s
-							}()},
+							}(),
 						},
 					},
 					Containers: []v1.Container{
@@ -1244,14 +1233,12 @@ func TestUnprepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: "test-pod-claim-nil",
-							Source: v1.ClaimSource{
 							ResourceClaimName: func() *string {
 								s := "test-pod-claim-nil"
 								return &s
 							}(),
 						},
 					},
-					},
 					Containers: []v1.Container{
 						{
 							Resources: v1.ResourceRequirements{
@@ -1396,7 +1383,7 @@ func TestGetContainerClaimInfos(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name:              "claim1",
-							Source: v1.ClaimSource{ResourceClaimName: &resourceClaimName},
+							ResourceClaimName: &resourceClaimName,
 						},
 					},
 				},
@@ -1419,7 +1406,7 @@ func TestGetContainerClaimInfos(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name:              "claim2",
-							Source: v1.ClaimSource{ResourceClaimName: &resourceClaimName2},
+							ResourceClaimName: &resourceClaimName2,
 						},
 					},
 				},
@@ -1502,10 +1489,10 @@ func TestParallelPrepareUnprepareResources(t *testing.T) {
 					ResourceClaims: []v1.PodResourceClaim{
 						{
 							Name: claimName,
-							Source: v1.ClaimSource{ResourceClaimName: func() *string {
+							ResourceClaimName: func() *string {
 								s := claimName
 								return &s
-							}()},
+							}(),
 						},
 					},
 					Containers: []v1.Container{

pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go

@@ -102,15 +102,15 @@ var (
 
 	podWithClaimName = st.MakePod().Name(podName).Namespace(namespace).
 				UID(podUID).
-				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, Source: v1.ClaimSource{ResourceClaimName: &claimName}}).
+				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, ResourceClaimName: &claimName}).
 				Obj()
 	otherPodWithClaimName = st.MakePod().Name(podName).Namespace(namespace).
 				UID(podUID + "-II").
-				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, Source: v1.ClaimSource{ResourceClaimName: &claimName}}).
+				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, ResourceClaimName: &claimName}).
 				Obj()
 	podWithClaimTemplate = st.MakePod().Name(podName).Namespace(namespace).
 				UID(podUID).
-				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, Source: v1.ClaimSource{ResourceClaimTemplateName: &claimName}}).
+				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, ResourceClaimTemplateName: &claimName}).
 				Obj()
 	podWithClaimTemplateInStatus = func() *v1.Pod {
 		pod := podWithClaimTemplate.DeepCopy()
@@ -124,8 +124,8 @@ var (
 	}()
 	podWithTwoClaimNames = st.MakePod().Name(podName).Namespace(namespace).
 				UID(podUID).
-				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, Source: v1.ClaimSource{ResourceClaimName: &claimName}}).
+				PodResourceClaims(v1.PodResourceClaim{Name: resourceName, ResourceClaimName: &claimName}).
-				PodResourceClaims(v1.PodResourceClaim{Name: resourceName2, Source: v1.ClaimSource{ResourceClaimName: &claimName2}}).
+				PodResourceClaims(v1.PodResourceClaim{Name: resourceName2, ResourceClaimName: &claimName2}).
 				Obj()
 
 	workerNode      = &st.MakeNode().Name("worker").Label("kubernetes.io/hostname", "worker").Node

plugin/pkg/auth/authorizer/node/node_authorizer_test.go

@@ -953,9 +953,7 @@ func generatePod(name, namespace, nodeName, svcAccountName string, opts *sampleD
 		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,
-			},
 		})
 	}
 	for i := 0; i < opts.uniqueResourceClaimTemplatesPerPod; i++ {
@@ -963,9 +961,7 @@ func generatePod(name, namespace, nodeName, svcAccountName string, opts *sampleD
 		podClaimName := fmt.Sprintf("claimtemplate%d", i)
 		pod.Spec.ResourceClaims = append(pod.Spec.ResourceClaims, corev1.PodResourceClaim{
 			Name:                      podClaimName,
-			Source: corev1.ClaimSource{
 			ResourceClaimTemplateName: &claimTemplateName,
-			},
 		})
 	}
 	for i := 0; i < opts.uniqueResourceClaimTemplatesWithClaimPerPod; i++ {
@@ -974,9 +970,7 @@ func generatePod(name, namespace, nodeName, svcAccountName string, opts *sampleD
 		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,
-			},
 		})
 		pod.Status.ResourceClaimStatuses = append(pod.Status.ResourceClaimStatuses, corev1.PodResourceClaimStatus{
 			Name:              podClaimName,

staging/src/k8s.io/api/core/v1/generated.proto

@@ -422,30 +422,6 @@ message CinderVolumeSource {
   optional LocalObjectReference secretRef = 4;
 }
 
-// ClaimSource describes a reference to a ResourceClaim.
-//
-// Exactly one of these fields should be set.  Consumers of this type must
-// treat an empty object as if it has an unknown value.
-message ClaimSource {
-  // ResourceClaimName is the name of a ResourceClaim object in the same
-  // namespace as this pod.
-  optional string resourceClaimName = 1;
-
-  // ResourceClaimTemplateName is the name of a ResourceClaimTemplate
-  // object in the same namespace as this pod.
-  //
-  // The template will be used to create a new ResourceClaim, which will
-  // be bound to this pod. When this pod is deleted, the ResourceClaim
-  // will also be deleted. The pod name and resource name, along with a
-  // generated component, will be used to form a unique name for the
-  // ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.
-  //
-  // This field is immutable and no changes will be made to the
-  // corresponding ResourceClaim by the control plane after creating the
-  // ResourceClaim.
-  optional string resourceClaimTemplateName = 2;
-}
-
 // ClientIPConfig represents the configurations of Client IP based session affinity.
 message ClientIPConfig {
   // timeoutSeconds specifies the seconds of ClientIP type session sticky time.
@@ -3827,7 +3803,10 @@ message PodReadinessGate {
   optional string conditionType = 1;
 }
 
-// PodResourceClaim references exactly one ResourceClaim through a ClaimSource.
+// PodResourceClaim references exactly one ResourceClaim, either directly
+// or by naming a ResourceClaimTemplate which is then turned into a ResourceClaim
+// for the pod.
+//
 // It adds a name to it that uniquely identifies the ResourceClaim inside the Pod.
 // Containers that need access to the ResourceClaim reference it with this name.
 message PodResourceClaim {
@@ -3835,8 +3814,29 @@ message PodResourceClaim {
   // This must be a DNS_LABEL.
   optional string name = 1;
 
-  // Source describes where to find the ResourceClaim.
+  // ResourceClaimName is the name of a ResourceClaim object in the same
-  optional ClaimSource source = 2;
+  // namespace as this pod.
+  //
+  // Exactly one of ResourceClaimName and ResourceClaimTemplateName must
+  // be set.
+  optional string resourceClaimName = 3;
+
+  // ResourceClaimTemplateName is the name of a ResourceClaimTemplate
+  // object in the same namespace as this pod.
+  //
+  // The template will be used to create a new ResourceClaim, which will
+  // be bound to this pod. When this pod is deleted, the ResourceClaim
+  // will also be deleted. The pod name and resource name, along with a
+  // generated component, will be used to form a unique name for the
+  // ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.
+  //
+  // This field is immutable and no changes will be made to the
+  // corresponding ResourceClaim by the control plane after creating the
+  // ResourceClaim.
+  //
+  // Exactly one of ResourceClaimName and ResourceClaimTemplateName must
+  // be set.
+  optional string resourceClaimTemplateName = 4;
 }
 
 // PodResourceClaimStatus is stored in the PodStatus for each PodResourceClaim

staging/src/k8s.io/api/core/v1/types.go

@@ -3920,7 +3920,10 @@ type PodSpec struct {
 	ResourceClaims []PodResourceClaim `json:"resourceClaims,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name" protobuf:"bytes,39,rep,name=resourceClaims"`
 }
 
-// PodResourceClaim references exactly one ResourceClaim through a ClaimSource.
+// PodResourceClaim references exactly one ResourceClaim, either directly
+// or by naming a ResourceClaimTemplate which is then turned into a ResourceClaim
+// for the pod.
+//
 // It adds a name to it that uniquely identifies the ResourceClaim inside the Pod.
 // Containers that need access to the ResourceClaim reference it with this name.
 type PodResourceClaim struct {
@@ -3928,18 +3931,17 @@ type PodResourceClaim struct {
 	// This must be a DNS_LABEL.
 	Name string `json:"name" protobuf:"bytes,1,name=name"`
 
-	// Source describes where to find the ResourceClaim.
+	// Source is tombstoned since Kubernetes 1.31 where it got replaced with
-	Source ClaimSource `json:"source,omitempty" protobuf:"bytes,2,name=source"`
+	// the inlined fields below.
-}
+	//
+	// Source ClaimSource `json:"source,omitempty" protobuf:"bytes,2,name=source"`
 
-// ClaimSource describes a reference to a ResourceClaim.
-//
-// Exactly one of these fields should be set.  Consumers of this type must
-// treat an empty object as if it has an unknown value.
-type ClaimSource struct {
 	// ResourceClaimName is the name of a ResourceClaim object in the same
 	// namespace as this pod.
-	ResourceClaimName *string `json:"resourceClaimName,omitempty" protobuf:"bytes,1,opt,name=resourceClaimName"`
+	//
+	// Exactly one of ResourceClaimName and ResourceClaimTemplateName must
+	// be set.
+	ResourceClaimName *string `json:"resourceClaimName,omitempty" protobuf:"bytes,3,opt,name=resourceClaimName"`
 
 	// ResourceClaimTemplateName is the name of a ResourceClaimTemplate
 	// object in the same namespace as this pod.
@@ -3953,7 +3955,10 @@ type ClaimSource struct {
 	// This field is immutable and no changes will be made to the
 	// corresponding ResourceClaim by the control plane after creating the
 	// ResourceClaim.
-	ResourceClaimTemplateName *string `json:"resourceClaimTemplateName,omitempty" protobuf:"bytes,2,opt,name=resourceClaimTemplateName"`
+	//
+	// Exactly one of ResourceClaimName and ResourceClaimTemplateName must
+	// be set.
+	ResourceClaimTemplateName *string `json:"resourceClaimTemplateName,omitempty" protobuf:"bytes,4,opt,name=resourceClaimTemplateName"`
 }
 
 // PodResourceClaimStatus is stored in the PodStatus for each PodResourceClaim

staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go

@@ -219,16 +219,6 @@ func (CinderVolumeSource) SwaggerDoc() map[string]string {
 	return map_CinderVolumeSource
 }
 
-var map_ClaimSource = map[string]string{
-	"":                          "ClaimSource describes a reference to a ResourceClaim.\n\nExactly one of these fields should be set.  Consumers of this type must treat an empty object as if it has an unknown value.",
-	"resourceClaimName":         "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.",
-	"resourceClaimTemplateName": "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.",
-}
-
-func (ClaimSource) SwaggerDoc() map[string]string {
-	return map_ClaimSource
-}
-
 var map_ClientIPConfig = map[string]string{
 	"":               "ClientIPConfig represents the configurations of Client IP based session affinity.",
 	"timeoutSeconds": "timeoutSeconds specifies the seconds of ClientIP type session sticky time. The value must be >0 && <=86400(for 1 day) if ServiceAffinity == \"ClientIP\". Default value is 10800(for 3 hours).",
@@ -1717,9 +1707,10 @@ func (PodReadinessGate) SwaggerDoc() map[string]string {
 }
 
 var map_PodResourceClaim = map[string]string{
-	"":       "PodResourceClaim references exactly one ResourceClaim through a ClaimSource. It adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
+	"":                          "PodResourceClaim references exactly one ResourceClaim, either directly or by naming a ResourceClaimTemplate which is then turned into a ResourceClaim for the pod.\n\nIt adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.",
 	"name":                      "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.",
-	"source": "Source describes where to find the ResourceClaim.",
+	"resourceClaimName":         "ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
+	"resourceClaimTemplateName": "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod.\n\nThe template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.\n\nThis field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim.\n\nExactly one of ResourceClaimName and ResourceClaimTemplateName must be set.",
 }
 
 func (PodResourceClaim) SwaggerDoc() map[string]string {

staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go

@@ -440,32 +440,6 @@ func (in *CinderVolumeSource) DeepCopy() *CinderVolumeSource {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClaimSource) DeepCopyInto(out *ClaimSource) {
-	*out = *in
-	if in.ResourceClaimName != nil {
-		in, out := &in.ResourceClaimName, &out.ResourceClaimName
-		*out = new(string)
-		**out = **in
-	}
-	if in.ResourceClaimTemplateName != nil {
-		in, out := &in.ResourceClaimTemplateName, &out.ResourceClaimTemplateName
-		*out = new(string)
-		**out = **in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClaimSource.
-func (in *ClaimSource) DeepCopy() *ClaimSource {
-	if in == nil {
-		return nil
-	}
-	out := new(ClaimSource)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClientIPConfig) DeepCopyInto(out *ClientIPConfig) {
 	*out = *in
@@ -4018,7 +3992,16 @@ func (in *PodReadinessGate) DeepCopy() *PodReadinessGate {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PodResourceClaim) DeepCopyInto(out *PodResourceClaim) {
 	*out = *in
-	in.Source.DeepCopyInto(&out.Source)
+	if in.ResourceClaimName != nil {
+		in, out := &in.ResourceClaimName, &out.ResourceClaimName
+		*out = new(string)
+		**out = **in
+	}
+	if in.ResourceClaimTemplateName != nil {
+		in, out := &in.ResourceClaimTemplateName, &out.ResourceClaimTemplateName
+		*out = new(string)
+		**out = **in
+	}
 	return
 }
 

staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.json

@@ -1755,11 +1755,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.yaml

@@ -859,7 +859,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.json

@@ -1756,11 +1756,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.yaml

@@ -867,7 +867,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.json

@@ -1757,11 +1757,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     }

staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.yaml

@@ -859,7 +859,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.json

@@ -1756,11 +1756,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.yaml

@@ -867,7 +867,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.json

@@ -1756,11 +1756,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.yaml

@@ -869,7 +869,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.json

@@ -1756,11 +1756,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.yaml

@@ -867,7 +867,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.json

@@ -1755,11 +1755,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.yaml

@@ -859,7 +859,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.json

@@ -1756,11 +1756,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.yaml

@@ -867,7 +867,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.json

@@ -1757,11 +1757,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     }

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.yaml

@@ -859,7 +859,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.json

@@ -1756,11 +1756,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.yaml

@@ -867,7 +867,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/batch.v1.CronJob.json

@@ -1839,11 +1839,9 @@
             "resourceClaims": [
               {
                 "name": "nameValue",
-                "source": {
                 "resourceClaimName": "resourceClaimNameValue",
                 "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
               }
-              }
             ]
           }
         },

staging/src/k8s.io/api/testdata/HEAD/batch.v1.CronJob.yaml

@@ -919,7 +919,6 @@ spec:
           - conditionType: conditionTypeValue
           resourceClaims:
           - name: nameValue
-            source:
             resourceClaimName: resourceClaimNameValue
             resourceClaimTemplateName: resourceClaimTemplateNameValue
           restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/batch.v1.Job.json

@@ -1790,11 +1790,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/batch.v1.Job.yaml

@@ -883,7 +883,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.json

@@ -1839,11 +1839,9 @@
             "resourceClaims": [
               {
                 "name": "nameValue",
-                "source": {
                 "resourceClaimName": "resourceClaimNameValue",
                 "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
               }
-              }
             ]
           }
         },

staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.yaml

@@ -919,7 +919,6 @@ spec:
           - conditionType: conditionTypeValue
           resourceClaims:
           - name: nameValue
-            source:
             resourceClaimName: resourceClaimNameValue
             resourceClaimTemplateName: resourceClaimTemplateNameValue
           restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/core.v1.Pod.json

@@ -1697,11 +1697,9 @@
     "resourceClaims": [
       {
         "name": "nameValue",
-        "source": {
         "resourceClaimName": "resourceClaimNameValue",
         "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
       }
-      }
     ]
   },
   "status": {

staging/src/k8s.io/api/testdata/HEAD/core.v1.Pod.yaml

@@ -815,7 +815,6 @@ spec:
   - conditionType: conditionTypeValue
   resourceClaims:
   - name: nameValue
-    source:
     resourceClaimName: resourceClaimNameValue
     resourceClaimTemplateName: resourceClaimTemplateNameValue
   restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/core.v1.PodTemplate.json

@@ -1740,11 +1740,9 @@
       "resourceClaims": [
         {
           "name": "nameValue",
-          "source": {
           "resourceClaimName": "resourceClaimNameValue",
           "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
         }
-        }
       ]
     }
   }

staging/src/k8s.io/api/testdata/HEAD/core.v1.PodTemplate.yaml

@@ -848,7 +848,6 @@ template:
     - conditionType: conditionTypeValue
     resourceClaims:
     - name: nameValue
-      source:
       resourceClaimName: resourceClaimNameValue
       resourceClaimTemplateName: resourceClaimTemplateNameValue
     restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.json

@@ -1746,11 +1746,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     }

staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.yaml

@@ -853,7 +853,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.json

@@ -1755,11 +1755,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.yaml

@@ -859,7 +859,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.json

@@ -1756,11 +1756,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     },

staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.yaml

@@ -869,7 +869,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue

staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.json

@@ -1757,11 +1757,9 @@
         "resourceClaims": [
           {
             "name": "nameValue",
-            "source": {
             "resourceClaimName": "resourceClaimNameValue",
             "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
           }
-          }
         ]
       }
     }

staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.yaml

@@ -859,7 +859,6 @@ spec:
       - conditionType: conditionTypeValue
       resourceClaims:
       - name: nameValue
-        source:
         resourceClaimName: resourceClaimNameValue
         resourceClaimTemplateName: resourceClaimTemplateNameValue
       restartPolicy: restartPolicyValue