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 '\'
kubernetes · Apr 16, 2018 · 7136ac7 · 7136ac7
1 parent f75db12
commit 7136ac7
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 0 deletions.
diff --git a/case-studies/index.html b/case-studies/index.html
@@ -16,10 +16,28 @@ <h5>A collection of users running Kubernetes in production.</h5>
             <div class="case-studies">
 
               <div class="case-study">
+<<<<<<< HEAD
                   <img src="/images/case_studies/crowdfire_feature.png" alt="Crowdfire">
                   <p class="quote">"In the 15 months that we’ve been using Kubernetes, it has been amazing for us. It enabled us to iterate quickly, increase development speed, and continuously deliver new features and bug fixes to our users, while keeping our operational costs and infrastructure management overhead under control."</p>
                   <!--<p class="attrib">—Amanpreet Singh, Software Engineer at Crowdfire</p>-->
                   <a href="/case-studies/crowdfire/">Read about Crowdfire</a>
+||||||| merged common ancestors
+                  <img src="/images/case_studies/blackrock.png" alt="BlackRock">
+                  <p class="quote">"My message to other enterprises like us is you can actually integrate Kubernetes into an existing, well-orchestrated machinery."</p>
+                  <!--<p class="attrib">— Michael Francis, Managing Director at BlackRock</p>-->
+                  <a href="/case-studies/blackrock/">Read about BlackRock</a>
+=======
+                  <img src="/images/case_studies/haufegroup_logo_feature.png" alt="Haufe Group">
+                  <p class="quote">"Over the next couple of years, people won’t even think that much about it when they want to run containers. Kubernetes is going to be the go-to solution."</p>
+                  <!--<p class="attrib">—  Martin Danielsson, Solution Architect at Haufe Group</p>-->
+                  <a href="/case-studies/haufegroup/">Read about Haufe Group</a>
+              </div>
+              <div class="case-study">
+                  <img src="/images/case_studies/blackrock.png" alt="BlackRock">
+                  <p class="quote">"My message to other enterprises like us is you can actually integrate Kubernetes into an existing, well-orchestrated machinery."</p>
+                  <!--<p class="attrib">— Michael Francis, Managing Director at BlackRock</p>-->
+                  <a href="/case-studies/blackrock/">Read about BlackRock</a>
+>>>>>>> 1.10 update (#7151)
               </div>
 
               <div class="case-study">
@@ -35,6 +53,7 @@ <h5>A collection of users running Kubernetes in production.</h5>
                   <!--<p class="attrib">— Eric Mountain, Senior Expert, Distributed Systems at Amadeus IT Group</p>-->
                   <a href="/case-studies/amadeus/">Read about Amadeus</a>
               </div>
+<<<<<<< HEAD
               <div class="case-study">
                   <img src="/images/case_studies/huawei_feature.png" alt="huawei">
                   <p class="quote">"Kubernetes basically solved most of our problems. Before, the time of deployment took about a week, now it only takes minutes."</p>
@@ -43,6 +62,15 @@ <h5>A collection of users running Kubernetes in production.</h5>
               </div>
 
 
+||||||| merged common ancestors
+              <div class="case-study">
+                  <img src="/images/case_studies/buffer.png" alt="Buffer">
+                  <p class="quote">"It’s amazing that we can use the Kubernetes solution off the shelf with our team. And it just keeps getting better."</p>
+                  <!--<p class="attrib">—  Dan Farrelly, Buffer Architect</p>-->
+                  <a href="/case-studies/buffer/">Read about Buffer</a>
+              </div>
+=======
+>>>>>>> 1.10 update (#7151)
             </div>
         </div>
     </main>
@@ -78,8 +106,13 @@ <h3>Kubernetes Users</h3>
           <a target="_blank" href="http://www.nextplatform.com/2015/11/12/inside-ebays-shift-to-kubernetes-and-containers-atop-openstack/"><img src="/images/case_studies/ebay_logo.png" alt="Ebay"></a>
           <a target="_blank" href="http://blogs.wsj.com/cio/2016/02/24/big-changes-in-goldmans-software-emerge-from-small-containers/"><img src="/images/case_studies/gs.png" alt="Goldman Sachs"></a>
           <a target="_blank" href="/case-studies/golfnow/"><img src="/images/case_studies/golfnow_logo.png" alt="GolfNow"></a>
+<<<<<<< HEAD
           <a target="_blank" href="/case-studies/haufegroup/"><img src="/images/case_studies/haufegroup_logo.png" alt="Haufe Group"></a>
           <a target="_blank" href="/case-studies/huawei/"><img src="/images/case_studies/huawei.png" alt="Huawei"></a>
+||||||| merged common ancestors
+=======
+          <a target="_blank" href="/case-studies/haufegroup/"><img src="/images/case_studies/haufegroup_logo.png" alt="Haufe Group"></a>
+>>>>>>> 1.10 update (#7151)
           <a target="_blank" href="http://blog.kubernetes.io/2017/02/inside-jd-com-shift-to-kubernetes-from-openstack.html"><img src="/images/case_studies/jd.png" alt="JD.COM"></a>
           <a target="_blank" href="https://www.openstack.org/videos/video/running-kubernetes-on-openstack-at-liveperson"><img src="/images/case_studies/liveperson.png" alt="LivePerson"></a>
           <a target="_blank" href="https://youtu.be/YkOY7DgXKyw"><img src="/images/case_studies/monzo_logo.png" alt="monzo"></a>

diff --git a/docs/concepts/cluster-administration/device-plugins.md b/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

diff --git a/docs/concepts/configuration/pod-priority-preemption.md b/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.