Merge pull request #47184 from salaxander/merged-main-dev-1.31

Merged main dev 1.31

Author: k8s-ci-robot

content/bn/examples/service/networking/example-ingress.yaml

@@ -5,6 +5,7 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /$1
 spec:
+  ingressClassName: nginx
   rules:
     - host: hello-world.info
       http:

content/en/blog/_posts/2015-03-00-Welcome-To-Kubernetes-Blog.md

@@ -4,10 +4,10 @@ date: 2015-03-20
 slug: welcome-to-kubernetes-blog
 url: /blog/2015/03/Welcome-To-Kubernetes-Blog
 evergreen: true
+author: >
+  Kit Merker (Google)
 ---
 
-**Author:** Kit Merker (Google)
-
 Welcome to the new Kubernetes Blog. Follow this blog to learn about the Kubernetes Open Source project. We plan to post release notes, how-to articles, events, and maybe even some off topic fun here from time to time.
 
 

content/en/blog/_posts/2015-04-00-Kubernetes-And-Mesosphere-Dcos.md

@@ -3,6 +3,8 @@ title: " Kubernetes and the Mesosphere DCOS "
 date: 2015-04-22
 slug: kubernetes-and-mesosphere-dcos
 url: /blog/2015/04/Kubernetes-And-Mesosphere-Dcos
+author: >
+   Craig McLuckie (Google)
 ---
 
 # Kubernetes and the Mesosphere DCOS
@@ -23,9 +25,5 @@ Kubernetes was designed from the start to make these capabilities available to e
 
 Mesosphere, one of the earliest supporters of the Kubernetes project, has been working closely with the core Kubernetes team to create a natural experience for users looking to get the best of both worlds, adding Kubernetes to every Mesos deployment they instantiate, whether it be in the public cloud, private cloud, or in a hybrid deployment model.  This is well aligned with the overall Kubernetes vision of creating ubiquitous management framework that runs anywhere a container can.  It will be interesting to see how you blend together the old world and the new on a commercially supported, versatile platform.
 
-Craig McLuckie
-
-Product Manager, Google and Kubernetes co-founder
-
 [1]: https://mesosphere.com/product/
 [2]: http://research.google.com/pubs/pub43438.html

content/en/blog/_posts/2015-05-00-Appc-Support-For-Kubernetes-Through-Rkt.md

@@ -3,6 +3,8 @@ title: " AppC Support for Kubernetes through RKT "
 date: 2015-05-04
 slug: appc-support-for-kubernetes-through-rkt
 url: /blog/2015/05/Appc-Support-For-Kubernetes-Through-Rkt
+author: >
+   Craig McLuckie (Google)
 ---
 We very recently accepted a pull request to the Kubernetes project to add appc support for the Kubernetes community.  Appc is a new open container specification that was initiated by CoreOS, and is supported through CoreOS rkt container runtime.
 
@@ -21,6 +23,3 @@ Docker has done an amazing job of democratizing container technologies and makin
 
 
 The really nice thing is that with Kubernetes you can now pick the container runtime that works best for you based on your workloads’ needs, change runtimes without having the replace your cluster environment, or even mix together applications where different parts are running in different container runtimes in the same cluster.  Additional choices can’t help but ultimately benefit the end developer.
-
--- Craig McLuckie  
-Google Product Manager and Kubernetes co-founder  

content/en/blog/_posts/2015-05-00-Docker-And-Kubernetes-And-Appc.md

@@ -3,6 +3,8 @@ title: " Docker and Kubernetes and AppC  "
 date: 2015-05-18
 slug: docker-and-kubernetes-and-appc
 url: /blog/2015/05/Docker-And-Kubernetes-And-Appc
+author: >
+   Craig McLuckie (Google)
 ---
 Recently we announced the intent in Kubernetes, our open source cluster manager, to support AppC and RKT, an alternative container format that has been driven by CoreOS with input from many companies (including Google).  This announcement has generated a surprising amount of buzz and has been construed as a move from Google to support Appc over Docker.  Many have taken it as signal that Google is moving away from supporting Docker.  I would like to take a moment to clarify Google’s position in this.
 
@@ -20,9 +22,3 @@ Our intent with our announcement for AppC and RKT support was to establish Kuber
 
 
 Stepping back a little, one must recognize that Docker has done remarkable work in democratizing container technologies and making them accessible to everyone.  We believe that Docker will continue to drive great experiences for developers looking to use containers and plan to support this technology and its burgeoning community indefinitely.  We, for one,  are looking forward to the upcoming Dockercon where Brendan Burns (a Kubernetes co-founder) will be talking about the role of Docker in modern distributed systems design.
-
-
-
--- Craig McLuckie
-
-Google Group Product Manager, and Kubernetes Project Co-Founder

content/en/blog/_posts/2015-05-00-Kubernetes-On-Openstack.md

@@ -3,6 +3,8 @@ title: " Kubernetes on OpenStack "
 date: 2015-05-19
 slug: kubernetes-on-openstack
 url: /blog/2015/05/Kubernetes-On-Openstack
+author: >
+   Martin Buhr (independent)
 ---
 
 
@@ -41,6 +43,3 @@ This list will grow, and is curated [here](https://opendev.org/x/k8s-docker-suit
 
 
 [The Kubernetes open source project](https://github.com/GoogleCloudPlatform/kubernetes) has continued to see fantastic community adoption and increasing momentum, with over 11,000 commits and 7,648 stars on GitHub. With supporters ranging from Red Hat and Intel to CoreOS and Box.net, it has come to represent a range of customer interests ranging from enterprise IT to cutting edge startups. We encourage you to give it a try, give us your feedback, and get involved in our growing community.
-
-
-- Martin Buhr, Product Manager, Kubernetes Open Source Project

content/en/blog/_posts/2015-05-00-Resource-Usage-Monitoring-Kubernetes.md

@@ -3,6 +3,9 @@ title:  Resource Usage Monitoring in Kubernetes
 date: 2015-05-12
 slug: resource-usage-monitoring-kubernetes
 url: /blog/2015/05/Resource-Usage-Monitoring-Kubernetes
+author: >
+   Vishnu Kannan (Google),
+   Victor Marmol (Google)
 ---
 
 Understanding how an application behaves when deployed is crucial to scaling the application and providing a reliable service. In a Kubernetes cluster, application performance can be examined at many different levels: containers, [pods](/docs/user-guide/pods), [services](/docs/user-guide/services), and whole clusters. As part of Kubernetes we want to provide users with detailed resource usage information about their running applications at all these levels. This will give users deep insights into how their applications are performing and where possible application bottlenecks may be found. In comes [Heapster](https://github.com/kubernetes/heapster), a project meant to provide a base monitoring platform on Kubernetes.  
@@ -96,7 +99,3 @@ Here is a snapshot of the a Google Cloud Monitoring dashboard showing cluster-wi
 
 
 Now that you’ve learned a bit about Heapster, feel free to try it out on your own clusters! The [Heapster repository](https://github.com/kubernetes/heapster) is available on GitHub. It contains detailed instructions to setup Heapster and its storage backends. Heapster runs by default on most Kubernetes clusters, so you may already have it! Feedback is always welcome. Please let us know if you run into any issues via the troubleshooting channels.
-
-
-
-_-- Vishnu Kannan and Victor Marmol, Google Software Engineers_

content/en/blog/_posts/2015-06-00-The-Distributed-System-Toolkit-Patterns.md

@@ -3,6 +3,8 @@ title: " The Distributed System ToolKit: Patterns for Composite Containers "
 date: 2015-06-29
 slug: the-distributed-system-toolkit-patterns
 url: /blog/2015/06/The-Distributed-System-Toolkit-Patterns
+author: >
+   Brendan Burns (Google)
 ---
 Having had the privilege of presenting some ideas from Kubernetes at DockerCon 2015, I thought I would make a blog post to share some of these ideas for those of you who couldn’t be there.  
 
@@ -41,6 +43,4 @@ Adapter containers standardize and normalize output.  Consider the task of
 ![Adapter Containers](/images/blog/2015-06-00-The-Distributed-System-Toolkit-Patterns/adapter-containers.png)
 
 
-In all of these cases, we've used the container boundary as an encapsulation/abstraction boundary that allows us to build modular, reusable components that we combine to build out applications.  This reuse enables us to more effectively share containers between different developers, reuse our code across multiple applications, and generally build more reliable, robust distributed systems more quickly.  I hope you’ve seen how Pods and composite container patterns can enable you to build robust distributed systems more quickly, and achieve container code re-use.  To try these patterns out yourself in your own applications. I encourage you to go check out open source Kubernetes or Google Container Engine.  
-
- - Brendan Burns, Software Engineer at Google
+In all of these cases, we've used the container boundary as an encapsulation/abstraction boundary that allows us to build modular, reusable components that we combine to build out applications.  This reuse enables us to more effectively share containers between different developers, reuse our code across multiple applications, and generally build more reliable, robust distributed systems more quickly.  I hope you’ve seen how Pods and composite container patterns can enable you to build robust distributed systems more quickly, and achieve container code re-use.  To try these patterns out yourself in your own applications. I encourage you to go check out open source Kubernetes or Google Container Engine.

content/en/blog/_posts/2015-07-00-How-Did-Quake-Demo-From-Dockercon-Work.md

@@ -3,6 +3,8 @@ title: " How did the Quake demo from DockerCon Work? "
 date: 2015-07-02
 slug: how-did-quake-demo-from-dockercon-work
 url: /blog/2015/07/How-Did-Quake-Demo-From-Dockercon-Work
+author: >
+   Saied Kazemi (Google)
 ---
 Shortly after its release in 2013, Docker became a very popular open source container management tool for Linux.  Docker has a rich set of commands to control the execution of a container. Commands such as start, stop, restart, kill, pause, and unpause. However, what is still missing is the ability to Checkpoint and Restore (C/R) a container natively via Docker itself.
 
@@ -189,8 +191,4 @@ If you are using a kernel older than 3.19 and your container uses AIO, you need
 
 
 - [torvalds: bd9b51e7](https://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bd9b51e7) by Al Viro
-- [torvalds: e4a0d3e72](https://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e4a0d3e72) by Pavel Emelyanov
-
-
-
-- Saied Kazemi, Software Engineer at Google
+- [torvalds: e4a0d3e72](https://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e4a0d3e72) by Pavel Emelyanov

content/en/blog/_posts/2015-07-00-Strong-Simple-Ssl-For-Kubernetes.md

@@ -3,6 +3,8 @@ title: " Strong, Simple SSL for Kubernetes Services "
 date: 2015-07-14
 slug: strong-simple-ssl-for-kubernetes
 url: /blog/2015/07/Strong-Simple-Ssl-For-Kubernetes
+author: >
+   Evan Brown (Google)
 ---
 Hi, I’m Evan Brown [(@evandbrown](http://twitter.com/evandbrown)) and I work on the solutions architecture team for Google Cloud Platform. I recently wrote an [article](https://cloud.google.com/solutions/automated-build-images-with-jenkins-kubernetes) and [tutorial](https://github.com/GoogleCloudPlatform/kube-jenkins-imager) about using Jenkins on Kubernetes to automate the Docker and GCE image build process. Today I’m going to discuss how I used Kubernetes services and secrets to add SSL to the Jenkins web UI. After reading this, you’ll be able to add SSL termination (and HTTP-\>HTTPS redirects + basic auth) to your public HTTP Kubernetes services.