1.10 update (#7151)

* Fix partition value expected behaviour explanation (#7123)

Fixes issue #7057

* Correct "On-Premise" to "On-Premises"

* Updates the Calico installation page (#7094)

* All files for Haufe Groups case study (#7051)

* Fix typo (#7127)

* fix typo of device-plugins.md (#7106)

* fix broken links (#7136)

* Updated configure-service-account (#7147)

Error from server resolved by escaping kubectl patch serviceaccount default -p '{"imagePullSecrets": [{"name": "myregistrykey"}]}' JSON string by '\'

docs/concepts/cluster-administration/device-plugins.md

@@ -62,8 +62,17 @@ metadata:
   name: demo-pod
 spec:
   containers:
+<<<<<<< HEAD
     - name: demo-container-1
       image: k8s.gcr.io/pause:2.0
+||||||| merged common ancestors
+    -
+      name: demo-container-1
+      image: gcr.io/google_containers/pause:2.0
+=======
+    - name: demo-container-1
+      image: gcr.io/google_containers/pause:2.0
+>>>>>>> 1.10 update (#7151)
       resources:
         limits:
           vendor-domain/resource: 2 # requesting 2 vendor-domain/resource

docs/concepts/configuration/pod-priority-preemption.md

@@ -220,11 +220,23 @@ can be scheduled on N. P might become feasible on N only if a Pod on another
 Node is preempted. Here's an example:
 
 * Pod P is being considered for Node N.
+<<<<<<< HEAD
 * Pod Q is running on another Node in the same Zone as Node N.
 * Pod P has Zone-wide anti-affinity with Pod Q
 (`topologyKey: failure-domain.beta.kubernetes.io/zone`).
 * There are no other cases of anti-affinity between Pod P and other Pods in the Zone.
 * In order to schedule Pod P on Node N, Pod Q can be preempted, but scheduler
+||||||| merged common ancestors
+* Pod Q is running on another Node in the same zone as Node N.
+* Pod P has anit-affinity with Pod Q.
+* There are no other cases of anti-affinity between Pod P and other Pods in the zone.
+* In order to schedule Pod P on Node N, Pod Q should be preempted, but scheduler
+=======
+* Pod Q is running on another Node in the same zone as Node N.
+* Pod P has anti-affinity with Pod Q.
+* There are no other cases of anti-affinity between Pod P and other Pods in the zone.
+* In order to schedule Pod P on Node N, Pod Q should be preempted, but scheduler
+>>>>>>> 1.10 update (#7151)
 does not perform cross-node preemption. So, Pod P will be deemed unschedulable
 on Node N.