github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRA: remove "source" indirection from v1 Pod API

Browse Source 
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:
Patrick Ohly 2024-05-24 15:24:24 +02:00
parent bb95d084a2
commit bde9b64cdf
209 changed files with 117866 additions and 2126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
api/openapi-spec/swagger.json generated
View File

@ -5813,20 +5813,6 @@
], ],
"type": "object" "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": { "io.k8s.api.core.v1.ClientIPConfig": {
"description": "ClientIPConfig represents the configurations of Client IP based session affinity.", "description": "ClientIPConfig represents the configurations of Client IP based session affinity.",
"properties": { "properties": {
@ -9371,15 +9357,19 @@
"type": "object" "type": "object"
}, },
"io.k8s.api.core.v1.PodResourceClaim": { "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": { "properties": {
"name": { "name": {
"description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.", "description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.",
"type": "string" "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": [ "required": [

31
api/openapi-spec/v3/api__v1_openapi.json
View File

@ -721,20 +721,6 @@
], ],
"type": "object" "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": { "io.k8s.api.core.v1.ClientIPConfig": {
"description": "ClientIPConfig represents the configurations of Client IP based session affinity.", "description": "ClientIPConfig represents the configurations of Client IP based session affinity.",
"properties": { "properties": {
@ -5253,21 +5239,20 @@
"type": "object" "type": "object"
}, },
"io.k8s.api.core.v1.PodResourceClaim": { "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": { "properties": {
"name": { "name": {
"default": "", "default": "",
"description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.", "description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.",
"type": "string" "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": [ "required": [

31
api/openapi-spec/v3/apis__apps__v1_openapi.json
View File

@ -1611,20 +1611,6 @@
], ],
"type": "object" "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": { "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.", "description": "ClusterTrustBundleProjection describes how to select a set of ClusterTrustBundle objects and project their contents into the pod filesystem.",
"properties": { "properties": {
@ -3574,21 +3560,20 @@
"type": "object" "type": "object"
}, },
"io.k8s.api.core.v1.PodResourceClaim": { "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": { "properties": {
"name": { "name": {
"default": "", "default": "",
"description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.", "description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.",
"type": "string" "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": [ "required": [

31
api/openapi-spec/v3/apis__batch__v1_openapi.json
View File

@ -960,20 +960,6 @@
], ],
"type": "object" "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": { "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.", "description": "ClusterTrustBundleProjection describes how to select a set of ClusterTrustBundle objects and project their contents into the pod filesystem.",
"properties": { "properties": {
@ -2778,21 +2764,20 @@
"type": "object" "type": "object"
}, },
"io.k8s.api.core.v1.PodResourceClaim": { "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": { "properties": {
"name": { "name": {
"default": "", "default": "",
"description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.", "description": "Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.",
"type": "string" "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": [ "required": [

6
pkg/api/pod/util_test.go
View File

@ -841,10 +841,8 @@ func TestDropDynamicResourceAllocation(t *testing.T) {
}, },
ResourceClaims: []api.PodResourceClaim{ ResourceClaims: []api.PodResourceClaim{
{ {
Name: "my-claim", Name: "my-claim",
Source: api.ClaimSource{ ResourceClaimName: &resourceClaimName,
ResourceClaimName: &resourceClaimName,
},
}, },
}, },
}, },

15
pkg/apis/core/types.go
View File

@ -3476,17 +3476,11 @@ type PodResourceClaim struct {
// This must be a DNS_LABEL. // This must be a DNS_LABEL.
Name string 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 // ResourceClaimName is the name of a ResourceClaim object in the same
// namespace as this pod. // namespace as this pod.
//
// Exactly one of ResourceClaimName and ResourceClaimTemplateName must
// be set.
ResourceClaimName *string ResourceClaimName *string
// ResourceClaimTemplateName is the name of a ResourceClaimTemplate // 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 // This field is immutable and no changes will be made to the
// corresponding ResourceClaim by the control plane after creating the // corresponding ResourceClaim by the control plane after creating the
// ResourceClaim. // ResourceClaim.
//
// Exactly one of ResourceClaimName and ResourceClaimTemplateName must
// be set.
ResourceClaimTemplateName *string ResourceClaimTemplateName *string
} }

42
pkg/apis/core/v1/zz_generated.conversion.go generated
View File

@ -202,16 +202,6 @@ func RegisterConversions(s *runtime.Scheme) error {
}); err != nil { }); err != nil {
return err 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 { 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) return Convert_v1_ClientIPConfig_To_core_ClientIPConfig(a.(*v1.ClientIPConfig), b.(*core.ClientIPConfig), scope)
}); err != nil { }); 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) 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 { func autoConvert_v1_ClientIPConfig_To_core_ClientIPConfig(in *v1.ClientIPConfig, out *core.ClientIPConfig, s conversion.Scope) error {
out.TimeoutSeconds = (*int32)(unsafe.Pointer(in.TimeoutSeconds)) out.TimeoutSeconds = (*int32)(unsafe.Pointer(in.TimeoutSeconds))
return nil 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 { func autoConvert_v1_PodResourceClaim_To_core_PodResourceClaim(in *v1.PodResourceClaim, out *core.PodResourceClaim, s conversion.Scope) error {
out.Name = in.Name 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 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 { func autoConvert_core_PodResourceClaim_To_v1_PodResourceClaim(in *core.PodResourceClaim, out *v1.PodResourceClaim, s conversion.Scope) error {
out.Name = in.Name 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 return nil
} }

29
pkg/apis/core/validation/validation.go
View File

@ -3020,7 +3020,7 @@ func validatePodResourceClaim(podMeta *metav1.ObjectMeta, claim core.PodResource
nameErrs := ValidateDNS1123Label(claim.Name, fldPath.Child("name")) nameErrs := ValidateDNS1123Label(claim.Name, fldPath.Child("name"))
if len(nameErrs) > 0 { if len(nameErrs) > 0 {
allErrs = append(allErrs, nameErrs...) allErrs = append(allErrs, nameErrs...)
} else if podMeta != nil && claim.Source.ResourceClaimTemplateName != nil { } else if podMeta != nil && claim.ResourceClaimTemplateName != nil {
claimName := podMeta.Name + "-" + claim.Name claimName := podMeta.Name + "-" + claim.Name
for _, detail := range ValidateResourceClaimName(claimName, false) { for _, detail := range ValidateResourceClaimName(claimName, false) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), claimName, "final ResourceClaim name: "+detail)) 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) 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 return allErrs

90
pkg/apis/core/validation/validation_test.go
View File

@ -22650,8 +22650,8 @@ func TestValidateOSFields(t *testing.T) {
"PriorityClassName", "PriorityClassName",
"ReadinessGates", "ReadinessGates",
"ResourceClaims[*].Name", "ResourceClaims[*].Name",
"ResourceClaims[*].Source.ResourceClaimName", "ResourceClaims[*].ResourceClaimName",
"ResourceClaims[*].Source.ResourceClaimTemplateName", "ResourceClaims[*].ResourceClaimTemplateName",
"RestartPolicy", "RestartPolicy",
"RuntimeClassName", "RuntimeClassName",
"SchedulerName", "SchedulerName",
@ -25857,9 +25857,6 @@ func TestValidatePVSecretReference(t *testing.T) {
func TestValidateDynamicResourceAllocation(t *testing.T) { func TestValidateDynamicResourceAllocation(t *testing.T) {
externalClaimName := "some-claim" externalClaimName := "some-claim"
externalClaimTemplateName := "some-claim-template" externalClaimTemplateName := "some-claim-template"
goodClaimSource := core.ClaimSource{
ResourceClaimName: &externalClaimName,
}
shortPodName := &metav1.ObjectMeta{ shortPodName := &metav1.ObjectMeta{
Name: "some-pod", Name: "some-pod",
} }
@ -25871,10 +25868,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim-template", Name: "my-claim-template",
Source: core.ClaimSource{ ResourceClaimTemplateName: &externalClaimTemplateName,
ResourceClaimTemplateName: &externalClaimTemplateName,
},
}}, }},
} }
goodClaimReference := core.PodSpec{ goodClaimReference := core.PodSpec{
@ -25882,10 +25877,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim-reference", Name: "my-claim-reference",
Source: core.ClaimSource{ ResourceClaimName: &externalClaimName,
ResourceClaimName: &externalClaimName,
},
}}, }},
} }
@ -25897,11 +25890,11 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim", Name: "my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}, { }, {
Name: "another-claim", Name: "another-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
"init container": { "init container": {
@ -25910,8 +25903,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim", Name: "my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
} }
@ -25929,8 +25922,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "../my-claim", Name: "../my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
"pod claim name with path": { "pod claim name with path": {
@ -25938,8 +25931,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my/claim", Name: "my/claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
"pod claim name empty": { "pod claim name empty": {
@ -25947,8 +25940,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "", Name: "",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
"duplicate pod claim entries": { "duplicate pod claim entries": {
@ -25956,11 +25949,11 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim", Name: "my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}, { }, {
Name: "my-claim", Name: "my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
"resource claim source empty": { "resource claim source empty": {
@ -25968,8 +25961,7 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim", Name: "my-claim",
Source: core.ClaimSource{},
}}, }},
}, },
"resource claim reference and template": { "resource claim reference and template": {
@ -25977,11 +25969,9 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim", Name: "my-claim",
Source: core.ClaimSource{ ResourceClaimName: &externalClaimName,
ResourceClaimName: &externalClaimName, ResourceClaimTemplateName: &externalClaimTemplateName,
ResourceClaimTemplateName: &externalClaimTemplateName,
},
}}, }},
}, },
"claim not found": { "claim not found": {
@ -25989,8 +25979,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim", Name: "my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
"claim name empty": { "claim name empty": {
@ -25998,8 +25988,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim", Name: "my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
"pod claim name duplicates": { "pod claim name duplicates": {
@ -26007,8 +25997,8 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim", Name: "my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
"no claims defined": { "no claims defined": {
@ -26021,11 +26011,11 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim", Name: "my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}, { }, {
Name: "my-claim", Name: "my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
"ephemeral container don't support resource requirements": { "ephemeral container don't support resource requirements": {
@ -26034,20 +26024,20 @@ func TestValidateDynamicResourceAllocation(t *testing.T) {
RestartPolicy: core.RestartPolicyAlways, RestartPolicy: core.RestartPolicyAlways,
DNSPolicy: core.DNSClusterFirst, DNSPolicy: core.DNSClusterFirst,
ResourceClaims: []core.PodResourceClaim{{ ResourceClaims: []core.PodResourceClaim{{
Name: "my-claim", Name: "my-claim",
Source: goodClaimSource, ResourceClaimName: &externalClaimName,
}}, }},
}, },
"invalid claim template name": func() core.PodSpec { "invalid claim template name": func() core.PodSpec {
spec := goodClaimTemplate.DeepCopy() spec := goodClaimTemplate.DeepCopy()
notLabel := ".foo_bar" notLabel := ".foo_bar"
spec.ResourceClaims[0].Source.ResourceClaimTemplateName = &notLabel spec.ResourceClaims[0].ResourceClaimTemplateName = &notLabel
return *spec return *spec
}(), }(),
"invalid claim reference name": func() core.PodSpec { "invalid claim reference name": func() core.PodSpec {
spec := goodClaimReference.DeepCopy() spec := goodClaimReference.DeepCopy()
notLabel := ".foo_bar" notLabel := ".foo_bar"
spec.ResourceClaims[0].Source.ResourceClaimName = &notLabel spec.ResourceClaims[0].ResourceClaimName = &notLabel
return *spec return *spec
}(), }(),
} }

37
pkg/apis/core/zz_generated.deepcopy.go generated
View File

@ -440,32 +440,6 @@ func (in *CinderVolumeSource) DeepCopy() *CinderVolumeSource {
return out 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. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ClientIPConfig) DeepCopyInto(out *ClientIPConfig) { func (in *ClientIPConfig) DeepCopyInto(out *ClientIPConfig) {
*out = *in *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. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *PodResourceClaim) DeepCopyInto(out *PodResourceClaim) { func (in *PodResourceClaim) DeepCopyInto(out *PodResourceClaim) {
*out = *in *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 return
} }

4
pkg/controller/resourceclaim/controller.go
View File

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

6
pkg/controller/resourceclaim/controller_test.go
View File

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

47
pkg/generated/openapi/zz_generated.openapi.go generated
View File

@ -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.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.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.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.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.ClusterTrustBundleProjection": schema_k8sio_api_core_v1_ClusterTrustBundleProjection(ref),
"k8s.io/api/core/v1.ComponentCondition": schema_k8sio_api_core_v1_ComponentCondition(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 { func schema_k8sio_api_core_v1_ClientIPConfig(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{ return common.OpenAPIDefinition{
Schema: spec.Schema{ Schema: spec.Schema{
@ -27038,7 +27010,7 @@ func schema_k8sio_api_core_v1_PodResourceClaim(ref common.ReferenceCallback) com
return common.OpenAPIDefinition{ return common.OpenAPIDefinition{
Schema: spec.Schema{ Schema: spec.Schema{
SchemaProps: spec.SchemaProps{ 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"}, Type: []string{"object"},
Properties: map[string]spec.Schema{ Properties: map[string]spec.Schema{
"name": { "name": {
@ -27049,19 +27021,24 @@ func schema_k8sio_api_core_v1_PodResourceClaim(ref common.ReferenceCallback) com
Format: "", Format: "",
}, },
}, },
"source": { "resourceClaimName": {
SchemaProps: spec.SchemaProps{ 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"}, Required: []string{"name"},
}, },
}, },
Dependencies: []string{
"k8s.io/api/core/v1.ClaimSource"},
} }
} }

127
pkg/kubelet/cm/dra/manager_test.go
View File

@ -224,8 +224,8 @@ func TestGetResources(t *testing.T) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-1", Name: "test-pod-claim-1",
Source: v1.ClaimSource{ResourceClaimName: &resourceClaimName}, ResourceClaimName: &resourceClaimName,
}, },
}, },
}, },
@ -268,8 +268,8 @@ func TestGetResources(t *testing.T) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-1", Name: "test-pod-claim-1",
Source: v1.ClaimSource{ResourceClaimName: &resourceClaimName}, ResourceClaimName: &resourceClaimName,
}, },
}, },
}, },
@ -365,12 +365,11 @@ func TestPrepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-0", Name: "test-pod-claim-0",
Source: v1.ClaimSource{
ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := "test-pod-claim-0" s := "test-pod-claim-0"
return &s return &s
}(), }(),
},
}, },
}, },
}, },
@ -390,12 +389,10 @@ func TestPrepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-1", Name: "test-pod-claim-1",
Source: v1.ClaimSource{ ResourceClaimName: func() *string {
ResourceClaimName: func() *string { s := "test-pod-claim-1"
s := "test-pod-claim-1" return &s
return &s }(),
}(),
},
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -447,12 +444,10 @@ func TestPrepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-nil", Name: "test-pod-claim-nil",
Source: v1.ClaimSource{ ResourceClaimName: func() *string {
ResourceClaimName: func() *string { s := "test-pod-claim-nil"
s := "test-pod-claim-nil" return &s
return &s }(),
}(),
},
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -506,12 +501,10 @@ func TestPrepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-empty", Name: "test-pod-claim-empty",
Source: v1.ClaimSource{ ResourceClaimName: func() *string {
ResourceClaimName: func() *string { s := "test-pod-claim-empty"
s := "test-pod-claim-empty" return &s
return &s }(),
}(),
},
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -565,12 +558,10 @@ func TestPrepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-2", Name: "test-pod-claim-2",
Source: v1.ClaimSource{ ResourceClaimName: func() *string {
ResourceClaimName: func() *string { s := "test-pod-claim-2"
s := "test-pod-claim-2" return &s
return &s }(),
}(),
},
}, },
}, },
}, },
@ -608,10 +599,10 @@ func TestPrepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-3", Name: "test-pod-claim-3",
Source: v1.ClaimSource{ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := "test-pod-claim-3" s := "test-pod-claim-3"
return &s return &s
}()}, }(),
}, },
}, },
}, },
@ -652,10 +643,10 @@ func TestPrepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-4", Name: "test-pod-claim-4",
Source: v1.ClaimSource{ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := "test-pod-claim-4" s := "test-pod-claim-4"
return &s return &s
}()}, }(),
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -717,10 +708,10 @@ func TestPrepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-5", Name: "test-pod-claim-5",
Source: v1.ClaimSource{ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := "test-pod-claim-5" s := "test-pod-claim-5"
return &s return &s
}()}, }(),
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -779,10 +770,10 @@ func TestPrepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-6", Name: "test-pod-claim-6",
Source: v1.ClaimSource{ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := "test-pod-claim-6" s := "test-pod-claim-6"
return &s return &s
}()}, }(),
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -840,10 +831,10 @@ func TestPrepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim", Name: "test-pod-claim",
Source: v1.ClaimSource{ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := "test-pod-claim" s := "test-pod-claim"
return &s return &s
}()}, }(),
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -1005,12 +996,10 @@ func TestUnprepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "another-claim-test", Name: "another-claim-test",
Source: v1.ClaimSource{ ResourceClaimName: func() *string {
ResourceClaimName: func() *string { s := "another-claim-test"
s := "another-claim-test" return &s
return &s }(),
}(),
},
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -1054,10 +1043,10 @@ func TestUnprepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-1", Name: "test-pod-claim-1",
Source: v1.ClaimSource{ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := "test-pod-claim-1" s := "test-pod-claim-1"
return &s return &s
}()}, }(),
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -1096,10 +1085,10 @@ func TestUnprepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-2", Name: "test-pod-claim-2",
Source: v1.ClaimSource{ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := "test-pod-claim-2" s := "test-pod-claim-2"
return &s return &s
}()}, }(),
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -1146,10 +1135,10 @@ func TestUnprepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-3", Name: "test-pod-claim-3",
Source: v1.ClaimSource{ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := "test-pod-claim-3" s := "test-pod-claim-3"
return &s return &s
}()}, }(),
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -1195,10 +1184,10 @@ func TestUnprepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim", Name: "test-pod-claim",
Source: v1.ClaimSource{ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := "test-pod-claim" s := "test-pod-claim"
return &s return &s
}()}, }(),
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -1244,12 +1233,10 @@ func TestUnprepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "test-pod-claim-nil", Name: "test-pod-claim-nil",
Source: v1.ClaimSource{ ResourceClaimName: func() *string {
ResourceClaimName: func() *string { s := "test-pod-claim-nil"
s := "test-pod-claim-nil" return &s
return &s }(),
}(),
},
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{
@ -1395,8 +1382,8 @@ func TestGetContainerClaimInfos(t *testing.T) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "claim1", Name: "claim1",
Source: v1.ClaimSource{ResourceClaimName: &resourceClaimName}, ResourceClaimName: &resourceClaimName,
}, },
}, },
}, },
@ -1418,8 +1405,8 @@ func TestGetContainerClaimInfos(t *testing.T) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: "claim2", Name: "claim2",
Source: v1.ClaimSource{ResourceClaimName: &resourceClaimName2}, ResourceClaimName: &resourceClaimName2,
}, },
}, },
}, },
@ -1502,10 +1489,10 @@ func TestParallelPrepareUnprepareResources(t *testing.T) {
ResourceClaims: []v1.PodResourceClaim{ ResourceClaims: []v1.PodResourceClaim{
{ {
Name: claimName, Name: claimName,
Source: v1.ClaimSource{ResourceClaimName: func() *string { ResourceClaimName: func() *string {
s := claimName s := claimName
return &s return &s
}()}, }(),
}, },
}, },
Containers: []v1.Container{ Containers: []v1.Container{

10
pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go
View File

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

18
plugin/pkg/auth/authorizer/node/node_authorizer_test.go
View File

@ -952,20 +952,16 @@ func generatePod(name, namespace, nodeName, svcAccountName string, opts *sampleD
for i := 0; i < opts.uniqueResourceClaimsPerPod; i++ { for i := 0; i < opts.uniqueResourceClaimsPerPod; i++ {
claimName := fmt.Sprintf("claim%d-%s-%s", i, pod.Name, pod.Namespace) claimName := fmt.Sprintf("claim%d-%s-%s", i, pod.Name, pod.Namespace)
pod.Spec.ResourceClaims = append(pod.Spec.ResourceClaims, corev1.PodResourceClaim{ pod.Spec.ResourceClaims = append(pod.Spec.ResourceClaims, corev1.PodResourceClaim{
Name: fmt.Sprintf("claim%d", i), Name: fmt.Sprintf("claim%d", i),
Source: corev1.ClaimSource{ ResourceClaimName: &claimName,
ResourceClaimName: &claimName,
},
}) })
} }
for i := 0; i < opts.uniqueResourceClaimTemplatesPerPod; i++ { for i := 0; i < opts.uniqueResourceClaimTemplatesPerPod; i++ {
claimTemplateName := fmt.Sprintf("claimtemplate%d-%s-%s", i, pod.Name, pod.Namespace) claimTemplateName := fmt.Sprintf("claimtemplate%d-%s-%s", i, pod.Name, pod.Namespace)
podClaimName := fmt.Sprintf("claimtemplate%d", i) podClaimName := fmt.Sprintf("claimtemplate%d", i)
pod.Spec.ResourceClaims = append(pod.Spec.ResourceClaims, corev1.PodResourceClaim{ pod.Spec.ResourceClaims = append(pod.Spec.ResourceClaims, corev1.PodResourceClaim{
Name: podClaimName, Name: podClaimName,
Source: corev1.ClaimSource{ ResourceClaimTemplateName: &claimTemplateName,
ResourceClaimTemplateName: &claimTemplateName,
},
}) })
} }
for i := 0; i < opts.uniqueResourceClaimTemplatesWithClaimPerPod; i++ { 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) podClaimName := fmt.Sprintf("claimtemplate-with-claim%d", i)
claimName := fmt.Sprintf("generated-claim-%s-%s-%d", pod.Name, pod.Namespace, i) claimName := fmt.Sprintf("generated-claim-%s-%s-%d", pod.Name, pod.Namespace, i)
pod.Spec.ResourceClaims = append(pod.Spec.ResourceClaims, corev1.PodResourceClaim{ pod.Spec.ResourceClaims = append(pod.Spec.ResourceClaims, corev1.PodResourceClaim{
Name: podClaimName, Name: podClaimName,
Source: corev1.ClaimSource{ ResourceClaimTemplateName: &claimTemplateName,
ResourceClaimTemplateName: &claimTemplateName,
},
}) })
pod.Status.ResourceClaimStatuses = append(pod.Status.ResourceClaimStatuses, corev1.PodResourceClaimStatus{ pod.Status.ResourceClaimStatuses = append(pod.Status.ResourceClaimStatuses, corev1.PodResourceClaimStatus{
Name: podClaimName, Name: podClaimName,

2689
staging/src/k8s.io/api/core/v1/generated.pb.go generated
View File

File diff suppressed because it is too large Load Diff

54
staging/src/k8s.io/api/core/v1/generated.proto
View File

@ -422,30 +422,6 @@ message CinderVolumeSource {
optional LocalObjectReference secretRef = 4; 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. // ClientIPConfig represents the configurations of Client IP based session affinity.
message ClientIPConfig { message ClientIPConfig {
// timeoutSeconds specifies the seconds of ClientIP type session sticky time. // timeoutSeconds specifies the seconds of ClientIP type session sticky time.
@ -3827,7 +3803,10 @@ message PodReadinessGate {
optional string conditionType = 1; 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. // 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. // Containers that need access to the ResourceClaim reference it with this name.
message PodResourceClaim { message PodResourceClaim {
@ -3835,8 +3814,29 @@ message PodResourceClaim {
// This must be a DNS_LABEL. // This must be a DNS_LABEL.
optional string name = 1; 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 // PodResourceClaimStatus is stored in the PodStatus for each PodResourceClaim

27
staging/src/k8s.io/api/core/v1/types.go
View File

@ -3920,7 +3920,10 @@ type PodSpec struct {
ResourceClaims []PodResourceClaim `json:"resourceClaims,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name" protobuf:"bytes,39,rep,name=resourceClaims"` 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. // 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. // Containers that need access to the ResourceClaim reference it with this name.
type PodResourceClaim struct { type PodResourceClaim struct {
@ -3928,18 +3931,17 @@ type PodResourceClaim struct {
// This must be a DNS_LABEL. // This must be a DNS_LABEL.
Name string `json:"name" protobuf:"bytes,1,name=name"` 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 // ResourceClaimName is the name of a ResourceClaim object in the same
// namespace as this pod. // 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 // ResourceClaimTemplateName is the name of a ResourceClaimTemplate
// object in the same namespace as this pod. // 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 // This field is immutable and no changes will be made to the
// corresponding ResourceClaim by the control plane after creating the // corresponding ResourceClaim by the control plane after creating the
// ResourceClaim. // 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 // PodResourceClaimStatus is stored in the PodStatus for each PodResourceClaim

17
staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go generated
View File

@ -219,16 +219,6 @@ func (CinderVolumeSource) SwaggerDoc() map[string]string {
return map_CinderVolumeSource 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{ var map_ClientIPConfig = map[string]string{
"": "ClientIPConfig represents the configurations of Client IP based session affinity.", "": "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).", "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{ 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.", "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 { func (PodResourceClaim) SwaggerDoc() map[string]string {

37
staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go generated
View File

@ -440,32 +440,6 @@ func (in *CinderVolumeSource) DeepCopy() *CinderVolumeSource {
return out 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. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ClientIPConfig) DeepCopyInto(out *ClientIPConfig) { func (in *ClientIPConfig) DeepCopyInto(out *ClientIPConfig) {
*out = *in *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. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *PodResourceClaim) DeepCopyInto(out *PodResourceClaim) { func (in *PodResourceClaim) DeepCopyInto(out *PodResourceClaim) {
*out = *in *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 return
} }

6
staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.yaml vendored
View File

@ -859,9 +859,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.yaml vendored
View File

@ -867,9 +867,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.yaml vendored
View File

@ -859,9 +859,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.yaml vendored
View File

@ -867,9 +867,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.yaml vendored
View File

@ -869,9 +869,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.yaml vendored
View File

@ -867,9 +867,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.yaml vendored
View File

@ -859,9 +859,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.yaml vendored
View File

@ -867,9 +867,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.yaml vendored
View File

@ -859,9 +859,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.yaml vendored
View File

@ -867,9 +867,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/batch.v1.CronJob.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/batch.v1.CronJob.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/batch.v1.CronJob.yaml vendored
View File

@ -919,9 +919,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/batch.v1.Job.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/batch.v1.Job.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/batch.v1.Job.yaml vendored
View File

@ -883,9 +883,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.yaml vendored
View File

@ -919,9 +919,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/core.v1.Pod.json vendored
View File

@ -1697,10 +1697,8 @@
"resourceClaims": [ "resourceClaims": [
{ {
"name": "nameValue", "name": "nameValue",
"source": { "resourceClaimName": "resourceClaimNameValue",
"resourceClaimName": "resourceClaimNameValue", "resourceClaimTemplateName": "resourceClaimTemplateNameValue"
"resourceClaimTemplateName": "resourceClaimTemplateNameValue"
}
} }
] ]
}, },

BIN
staging/src/k8s.io/api/testdata/HEAD/core.v1.Pod.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/core.v1.Pod.yaml vendored
View File

@ -815,9 +815,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/core.v1.PodTemplate.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/core.v1.PodTemplate.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/core.v1.PodTemplate.yaml vendored
View File

@ -848,9 +848,8 @@ template:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.yaml vendored
View File

@ -853,9 +853,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.yaml vendored
View File

@ -859,9 +859,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.yaml vendored
View File

@ -869,9 +869,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

6
staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.json vendored
View File

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

BIN
staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.pb vendored
View File

Binary file not shown.

5
staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.yaml vendored
View File

@ -859,9 +859,8 @@ spec:
- conditionType: conditionTypeValue - conditionType: conditionTypeValue
resourceClaims: resourceClaims:
- name: nameValue - name: nameValue
source: resourceClaimName: resourceClaimNameValue
resourceClaimName: resourceClaimNameValue resourceClaimTemplateName: resourceClaimTemplateNameValue
resourceClaimTemplateName: resourceClaimTemplateNameValue
restartPolicy: restartPolicyValue restartPolicy: restartPolicyValue
runtimeClassName: runtimeClassNameValue runtimeClassName: runtimeClassNameValue
schedulerName: schedulerNameValue schedulerName: schedulerNameValue

1772
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.DaemonSet.after_roundtrip.json vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.DaemonSet.after_roundtrip.pb vendored Normal file
View File

Binary file not shown.

1213
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.DaemonSet.after_roundtrip.yaml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1774
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.Deployment.after_roundtrip.json vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.Deployment.after_roundtrip.pb vendored Normal file
View File

Binary file not shown.

1215
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.Deployment.after_roundtrip.yaml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1761
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.ReplicaSet.after_roundtrip.json vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.ReplicaSet.after_roundtrip.pb vendored Normal file
View File

Binary file not shown.

1204
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.ReplicaSet.after_roundtrip.yaml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1900
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.StatefulSet.after_roundtrip.json vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.StatefulSet.after_roundtrip.pb vendored Normal file
View File

Binary file not shown.

1304
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1.StatefulSet.after_roundtrip.yaml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1777
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1beta1.Deployment.after_roundtrip.json vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1beta1.Deployment.after_roundtrip.pb vendored Normal file
View File

Binary file not shown.

1217
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1beta1.Deployment.after_roundtrip.yaml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1900
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1beta1.StatefulSet.after_roundtrip.json vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1beta1.StatefulSet.after_roundtrip.pb vendored Normal file
View File

Binary file not shown.

1304
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1beta1.StatefulSet.after_roundtrip.yaml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1772
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1beta2.DaemonSet.after_roundtrip.json vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1beta2.DaemonSet.after_roundtrip.pb vendored Normal file
View File

Binary file not shown.

1213
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1beta2.DaemonSet.after_roundtrip.yaml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1774
staging/src/k8s.io/api/testdata/v1.29.0/apps.v1beta2.Deployment.after_roundtrip.json vendored Normal file
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More