From caa09afc95b25a4c0f417e200cdec60ce509626d Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 10 Jun 2016 10:08:01 +0200 Subject: [PATCH] Update PVC.Selector docs: it's ignored when VolumeName is set --- pkg/api/types.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index 6392ec21fa1..5304760ee2f 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -306,6 +306,8 @@ type PersistentVolumeSpec struct { // ClaimRef is part of a bi-directional binding between PersistentVolume and PersistentVolumeClaim. // ClaimRef is expected to be non-nil when bound. // 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"` // Optional: what happens to a persistent volume when released from its claim. PersistentVolumeReclaimPolicy PersistentVolumeReclaimPolicy `json:"persistentVolumeReclaimPolicy,omitempty"` @@ -366,11 +368,13 @@ type PersistentVolumeClaimList struct { type PersistentVolumeClaimSpec struct { // Contains the types of access modes required 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"` // Resources represents the minimum resources required 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"` }