Merge pull request #15814 from soltysh/job_doc

Update job user-guide doc to reflect recent changes to .spec.selector

docs/user-guide/job.yaml

@@ -4,6 +4,7 @@ metadata:
   name: pi
 spec:
   selector:
+    matchLabels:
       app: pi
   template:
     metadata:

docs/user-guide/jobs.md

@@ -76,6 +76,7 @@ metadata:
   name: pi
 spec:
   selector:
+    matchLabels:
       app: pi
   template:
     metadata:
@@ -162,11 +163,16 @@ Only a [`RestartPolicy`](pod-states.md) equal to `Never` or `OnFailure` are allo
 
 ### Pod Selector
 
-The `.spec.selector` field is a pod selector.  It works the same as the `.spec.selector` of
-a [ReplicationController](replication-controller.md).
+The `.spec.selector` field is a label query over a set of pods.
 
-If specified, the `.spec.template.metadata.labels` must be equal to the `.spec.selector`, or it will
-be rejected by the API.  If `.spec.selector` is unspecified, it will be defaulted to
+The `spec.selector` is an object consisting of two fields:
+* `matchLabels` - works the same as the `.spec.selector` of a [ReplicationController](replication-controller.md)
+* `matchExpressions` - allows to build more sophisticated selectors by specyfing key,
+  list of values and an operator that relates the key and values.
+
+When the two are specified the result is ANDed.
+
+If `.spec.selector` is unspecified, `.spec.selector.matchLabels` will be defaulted to
 `.spec.template.metadata.labels`.
 
 Also you should not normally create any pods whose labels match this selector, either directly,