Update PVC.Selector docs: it's ignored when VolumeName is set

This commit is contained in:
Jan Safranek 2016-06-10 10:08:01 +02:00
parent 1f18eee335
commit caa09afc95

View File

@ -306,6 +306,8 @@ type PersistentVolumeSpec struct {
// ClaimRef is part of a bi-directional binding between PersistentVolume and PersistentVolumeClaim. // ClaimRef is part of a bi-directional binding between PersistentVolume and PersistentVolumeClaim.
// ClaimRef is expected to be non-nil when bound. // ClaimRef is expected to be non-nil when bound.
// claim.VolumeName is the authoritative bind between PV and PVC. // claim.VolumeName is the authoritative bind between PV and PVC.
// When set to non-nil value, PVC.Spec.Selector of the referenced PVC is
// ignored, i.e. labels of this PV do not need to match PVC selector.
ClaimRef *ObjectReference `json:"claimRef,omitempty"` ClaimRef *ObjectReference `json:"claimRef,omitempty"`
// Optional: what happens to a persistent volume when released from its claim. // Optional: what happens to a persistent volume when released from its claim.
PersistentVolumeReclaimPolicy PersistentVolumeReclaimPolicy `json:"persistentVolumeReclaimPolicy,omitempty"` PersistentVolumeReclaimPolicy PersistentVolumeReclaimPolicy `json:"persistentVolumeReclaimPolicy,omitempty"`
@ -366,11 +368,13 @@ type PersistentVolumeClaimList struct {
type PersistentVolumeClaimSpec struct { type PersistentVolumeClaimSpec struct {
// Contains the types of access modes required // Contains the types of access modes required
AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty"` AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty"`
// A label query over volumes to consider for binding // A label query over volumes to consider for binding. This selector is
// ignored when VolumeName is set
Selector *unversioned.LabelSelector `json:"selector,omitempty"` Selector *unversioned.LabelSelector `json:"selector,omitempty"`
// Resources represents the minimum resources required // Resources represents the minimum resources required
Resources ResourceRequirements `json:"resources,omitempty"` Resources ResourceRequirements `json:"resources,omitempty"`
// VolumeName is the binding reference to the PersistentVolume backing this claim // VolumeName is the binding reference to the PersistentVolume backing this
// claim. When set to non-empty value Selector is not evaluated
VolumeName string `json:"volumeName,omitempty"` VolumeName string `json:"volumeName,omitempty"`
} }