merge pr mattmakai#205 and add kubernetes resources

mattmakai · mattmakai · commit ddb2b8f5836b · 2019-02-20T05:37:24.000-05:00
diff --git a/content/pages/04-web-development/44-web-apis.markdown b/content/pages/04-web-development/44-web-apis.markdown
@@ -62,6 +62,10 @@ on the number's page on Twilio as shown below.
   [APIs 101](https://zapier.com/blog/apis-101/) free guide for what APIs 
   are, why they are valuable and how to use them properly. 
 
+* [What is REST?](http://mickadoo.github.io/rest/2016/09/26/what-is-rest.html)
+  is a well-written overview of the REpresentational State Transfer (REST)
+  architecture proposed by Roy Fielding in his dissertation.
+
 * [GET PUT POST](https://medium.com/get-put-post) is a newsletter just
   about APIs. Past issues have included interviews with the developers 
   behind Stripe, Dropbox and Coinbase.
diff --git a/content/pages/05-deployment/07-digitalocean.markdown b/content/pages/05-deployment/07-digitalocean.markdown
@@ -11,6 +11,8 @@ meta: DigitalOcean is a virtual private server provider and deployment platform
 DigitalOcean is a virtual private server provider and deployment 
 platform that can be used for running Python applications.
 
+<a href="https://do.co/fullstackpython" style="border: none;"><img src="/img/logos/digitalocean.png" width="100%" alt="Official DigitalOcean logo. Copyright DigitalOcean." class="shot" style="padding: 12px 0 12px 0"></a>
+
 
 ### DigitalOcean examples
 * [Creating a Kubernetes Cluster on DigitalOcean with Python and Fabric](https://testdriven.io/blog/creating-a-kubernetes-cluster-on-digitalocean/)
diff --git a/content/pages/05-deployment/27-continuous-integration.markdown b/content/pages/05-deployment/27-continuous-integration.markdown
@@ -143,6 +143,10 @@ programming language agnostic. Learn more via the following resources or on
   includes advice on checking in code, commit tests and reverting to
   previous revisions.
 
+* [Scoring Continuous Integration](https://paulhammant.com/2017/05/01/scoring-continuous-integration/)
+  gives an interesting perspective on ways to rank the effectiveness
+  of how teams use their CI tooling.
+
 * [Why Continuous Integration Is Important](https://blog.codeship.com/continuous-integration-important/)
   is a high-level overview of how CI can build trust both among developers
   and between developers and non-technical people in an organization. The
diff --git a/content/pages/05-deployment/37-kubernetes.markdown b/content/pages/05-deployment/37-kubernetes.markdown
@@ -0,0 +1,35 @@
+title: Kubernetes
+category: page
+slug: kubernetes
+sortorder: 0537
+toc: False
+sidebartitle: Kubernetes
+meta: Kubernetes is a container orchestration system for deploying, scaling and managing applications.
+
+
+# Kubernetes
+[Kubernetes](https://kubernetes.io/) 
+([source code](https://github.com/kubernetes/kubernetes)) is a 
+[container](/containers.html) orchestration system for 
+[deploying](/deployment.html), scaling and [operating](/devops.html) 
+applications.
+
+<a href="https://kubernetes.io/" style="border: none;"><img src="/img/logos/kubernetes.png" width="100%" alt="Official Kubernetes logo." class="shot" style="padding: 6px 0 6px 0"></a>
+
+
+
+### Kubernetes resources
+* [Borg, Omega and Kubernetes](https://queue.acm.org/detail.cfm?id=2898444)
+  goes into the history of Borg and Omega, projects that preceded 
+  Kubernetes' creation. There are a ton of great notes on why they developed
+  the project in certain ways and what they knew to avoid based on the
+  prior work on Borg and Omega.
+
+* [Kubernetes The Hard Way](https://github.com/kelseyhightower/kubernetes-the-hard-way)
+  is a tutorial that walks you through manually setting up a Kubernetes
+  cluster. The purpose is to teach you what is happening at each step instead 
+  of performing everything through automation like you normally would after
+  you understand how to use the tool.
+
+* [Kubernetes by Example](http://kubernetesbyexample.com/) provides the 
+  commands and code for you to get started with the core Kubernetes concepts.
diff --git a/content/pages/06-devops/00-devops.markdown b/content/pages/06-devops/00-devops.markdown
@@ -72,7 +72,16 @@ teams, culture, processes and tools into software development organizations.
   principles behind keeping the largest websites alive. Note though that
   some of the advice in the book will be considered controversial at more
   stodgy traditional organizations that have done operations differently
-  for a long time.
+  for a long time. There is also 
+  [a wonderful interview with Ben Treynor](https://landing.google.com/sre/interview/ben-treynor/), 
+  one of the authors of the book, that contains additional information.
+
+* [The Increment](https://increment.com/), Stripe's fantastic digital and
+  print magazine, has 
+  [an issue dedicated to being on-call](https://increment.com/on-call/)
+  which discusses many DevOps-related topics such as what happens when
+  your pager goes off, ownership and how startups can be different from
+  large companies with their incident responses.
 
 * [Bing: Continuous Delivery](http://stories.visualstudio.com/bing-continuous-delivery/)
   is an impressive visual story that explains the practices for how their
diff --git a/static/img/logos/kubernetes.png b/static/img/logos/kubernetes.png
diff --git a/theme/templates/choices/kubernetes.html b/theme/templates/choices/kubernetes.html
@@ -0,0 +1,18 @@
+<h3>What do you want to learn next about Python deployments?</h3>
+<div class="row">
+ <div class="c4">
+  <div class="well select-next">
+   {% include "choices/buttons/deployment.html" %}
+  </div>
+ </div>
+ <div class="c4">
+  <div class="well select-next">
+   {% include "choices/buttons/continuous-integration.html" %}
+  </div>
+ </div>
+ <div class="c4">
+  <div class="well select-next">
+   {% include "choices/buttons/logging.html" %}
+  </div>
+ </div>
+</div>
diff --git a/theme/templates/table-of-contents.html b/theme/templates/table-of-contents.html
@@ -179,9 +179,9 @@ <h4>5.7 <a href="/continuous-integration.html">Continuous integration</a></h4>
 <h4>5.8 <a href="/configuration-management.html">Configuration management</a></h4>
 <div class="tc"><a href="/ansible.html">Ansible</a></div>
 <div class="tc sn">Salt</div>
-<h4>5.9 <span class="sn">Containers</span></h4>
+<h4>5.9 <a href="/containers.html">Containers</a></h4>
 <div class="tc"><a href="/docker.html">Docker</a></div>
-<div class="tc sn">Kubernetes</div>
+<div class="tc"><a href="/kubernetes.html">Kubernetes</a></div>
 <h4>5.10 <a href="/serverless.html">Serverless Architectures</a></h4>
 <div class="tc tds"><a href="/aws-lambda.html">AWS Lambda</a></div>
 <div class="tc tds sn">Azure Functions</div>
