summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2016-08-17 23:24:49 -0700
committerGitHub <noreply@github.com>2016-08-17 23:24:49 -0700
commit39310a68ba849c013357951ef10ba8e86bbf3036 (patch)
treefacb1ad1ccba1c743897f909fe8ecfb2f85535c3
parentbca3dd1f44b2d0e0d6d5470e38e00fa477fe2c10 (diff)
parentdab3faa4f1f623710f9ea350426cff2921f79118 (diff)
Merge pull request #30511 from danwinship/network-policy-docs
Automatic merge from submit-queue Remove incorrect docs about unset fields in NetworkPolicyPeer While hammering out the semantics of not-present vs present-but-empty, we appear to have added incorrect clarifications to NetworkPolicyPeer, where the semantics of PodSelector not being present is supposed to be "do what NamespaceSelector" says, not "select no pods", and likewise with NamespaceSelector not being present. I think it's clearest if we just don't say anything, since we already said "Exactly one of the following must be specified" above. Alternatively we could be redundant and say "(If not provided, then NamespaceSelector must be set.)" or something like that. @caseydavenport @thockin
-rw-r--r--network-policy.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/network-policy.md b/network-policy.md
index c60f3f5c..3743211b 100644
--- a/network-policy.md
+++ b/network-policy.md
@@ -207,14 +207,12 @@ type NetworkPolicyPeer struct {
// This is a label selector which selects Pods in this namespace.
// This field follows standard unversioned.LabelSelector semantics.
- // If not provided, this selector selects no pods.
// If present but empty, this selector selects all pods in this namespace.
PodSelector *unversioned.LabelSelector `json:"podSelector,omitempty"`
// Selects Namespaces using cluster scoped-labels. This
// matches all pods in all namespaces selected by this label selector.
// This field follows standard unversioned.LabelSelector semantics.
- // If omited, this selector selects no namespaces.
// If present but empty, this selector selects all namespaces.
NamespaceSelector *unversioned.LabelSelector `json:"namespaceSelector,omitempty"`
}