Merge master into release-1.10

kubernetes · Mar 27, 2018 · a82498b · a82498b
2 parents dbbd826 + 770440d
commit a82498b
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 1,457 deletions.
diff --git a/OWNERS b/OWNERS
@@ -5,8 +5,6 @@ reviewers:
 - bradtopol
 approvers:
 - heckj
-- a-mccarthy
-- abiogenesis-now
 - bradamant3
 - bradtopol
 - steveperry-53

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -87,12 +87,11 @@ aliases:
     - grodrigues3
     - spxtr
   sig-docs: #Team: documentation; GH: sig-docs-pr-reviews
-    - a-mccarthy
-    - abiogenesis-now
     - bradamant3
     - steveperry-53
     - zacharysarah
     - bradtopol
+    - heckj
   sig-federation: #Team: Federation; e.g. Federated Clusters
     - csbell
   sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews
@@ -204,4 +203,3 @@ aliases:
     - floreks
   sig-windows:
     - michmike
-
diff --git a/_data/setup.yml b/_data/setup.yml
@@ -75,7 +75,6 @@ toc:
 
     - title: Bare Metal
       section:
-      - docs/getting-started-guides/coreos/bare_metal_offline.md
       - docs/getting-started-guides/fedora/fedora_manual_config.md
       - docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
       - docs/getting-started-guides/coreos/index.md

diff --git a/_includes/partner-script.js b/_includes/partner-script.js
@@ -490,6 +490,13 @@
 			link: 'https://tenxcloud.com',
 			blurb: 'TenxCloud - TenxCloud Container Engine (TCE)'
 				},
+		{
+			type: 2,
+			name: 'TenxCloud',
+			logo: 'tenxcloud',
+			link: 'https://www.tenxcloud.com/',
+			blurb: 'Founded in October 2014, TenxCloud is a leading enterprise container cloud computing service provider in China, covering the areas such as container PaaS cloud platform, micro-service management, DevOps, development test, AIOps and so on. Provide private cloud PaaS products and solutions for financial, energy, operator, manufacturing, education and other industry customers.'
+				},
 		{
 			type: 0,
 			name: 'Twistlock',
@@ -1410,7 +1417,7 @@
 		{
 			type: 0,
 			name: 'Hedvig',
-			logo: 'hevig',
+			logo: 'hedvig',
 			link: 'https://www.hedviginc.com/blog/provisioning-hedvig-storage-with-kubernetes',
 			blurb: 'Hedvig is software-defined storage that uses NFS or iSCSI for persistent volumes for provisioning shared storage for pods and containers.'
 				},

diff --git a/case-studies/index.html b/case-studies/index.html
@@ -14,6 +14,12 @@ <h5>A collection of users running Kubernetes in production.</h5>
     <main>
         <div class="content">
             <div class="case-studies">
+                 <div class="case-study">
+                  <img src="/images/case_studies/amadeus_feature.png" alt="amadeus">
+                  <p class="quote">"We didn’t think that we could achieve them with our existing system. We need new automation, things that Kubernetes and OpenShift bring."</p>
+                  <!--<p class="attrib">— Eric Mountain, Senior Expert, Distributed Systems at Amadeus IT Group</p>-->
+                  <a href="/case-studies/amadeus/">Read about Amadeus</a>
+              </div>
               <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>
@@ -32,18 +38,6 @@ <h5>A collection of users running Kubernetes in production.</h5>
                   <!--<p class="attrib">— Michael Francis, Managing Director at BlackRock</p>-->
                   <a href="/case-studies/blackrock/">Read about BlackRock</a>
               </div>
-              <div class="case-study">
-                  <img src="/images/case_studies/blablacar-logo.png" alt="blablacar">
-                  <p class="quote">"[With Kubernetes] our infrastructure is much more resilient and we have better availability than before."</p>
-                  <!--<p class="attrib">—  Simon Lallemand, Infrastructure Engineer at BlaBlaCar</p>-->
-                  <a href="/case-studies/blablacar/">Read about BlaBlaCar</a>
-              </div>
-              <div class="case-study">
-                  <img src="/images/case_studies/peardeck.png" alt="peardeck">
-                  <p class="quote">"In terms of the cloud, Kubernetes and Prometheus have so much to offer."</p>
-                  <!--<p class="attrib">—  Riley Eynon-Lynch, CEO of Pear Deck</p>-->
-                  <a href="/case-studies/peardeck/">Read about Pear Deck</a>
-              </div>
             </div>
         </div>
     </main>
@@ -65,7 +59,7 @@ <h4><i>"Kubernetes has the opportunity to be the new cloud platform. The amount
     <main>
         <h3>Kubernetes Users</h3>
         <div id="usersGrid">
-          <a target="_blank" href="http://www.nextplatform.com/2015/08/04/amadeus-takes-off-with-containers-and-clouds/"><img src="/images/case_studies/amadeus.png" alt="Amadeus"></a>
+          <a target="_blank" href="/case-studies/amadeus/"><img src="/images/case_studies/amadeus.png" alt="Amadeus"></a>
           <a target="_blank" href="/case-studies/ancestry/"><img src="/images/case_studies/ancestry.png" alt="Ancestry.com"></a>
           <a target="_blank" href="/case-studies/blablacar/"><img src="/images/case_studies/blablacar.png" alt="BlaBlaCar"></a>
           <a target="_blank" href="/case-studies/blackrock/"><img src="/images/case_studies/blackrock2.png" alt="BlackRock"></a>