merge master to 1.10, with fixes (#7682)

2018-03-08 14:03:55 -05:00
parent bb8c59a640
commit 44b51d6056
548 changed files with 11634 additions and 318622 deletions
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - soltysh
 - sttts
 - ericchiang
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - fgrzadkowski
 - piosz
 title: Core metrics pipeline
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - janetkuo
 - thockin
 title: Application Introspection and Debugging
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - mikedanese
 - thockin
 title: Troubleshoot Applications
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - davidopp
 title: Troubleshoot Clusters
 ---
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - bprashanth
 - enisoc
 - erictune
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - bprashanth
 title: Debug Pods and Replication Controllers
 ---
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - thockin
 - bowei
 title: Debug Services
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - bprashanth
 - enisoc
 - erictune
@@ -21,7 +21,7 @@ subjects:
  name: event-exporter-sa
  namespace: default
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: event-exporter-v0.1.0
@@ -29,6 +29,9 @@ metadata:
  labels:
    app: event-exporter
 spec:
+  selector:
+    matchLabels:
+      app: event-exporter
  replicas: 1
  template:
    metadata:
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - crassirostris
 - piosz
 title: Events in Stackdriver
@@ -55,7 +55,7 @@ spec:
          readOnly: true
        - name: config-volume
          mountPath: /etc/fluent/config.d
-        # Liveness probe is aimed to help in situarions where fluentd
+        # Liveness probe is aimed to help in situations where fluentd
        # silently hangs for no apparent reasons until manual restart.
        # The idea of this probe is that if fluentd is not queueing or
        # flushing chunks for 5 minutes, something is not right. If
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - caesarxuchao
 - mikedanese
 title: Get a Shell to a Running Container
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - crassirostris
 - piosz
 title: Logging Using Elasticsearch and Kibana
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - crassirostris
 - piosz
 title: Logging Using Stackdriver
@@ -10,7 +10,7 @@ with the [overview of logging in Kubernetes](/docs/concepts/cluster-administrati

 **Note:** By default, Stackdriver logging collects only your container's standard output and
 standard error streams. To collect any logs your application writes to a file (for example),
-see the [sidecar approach](/docs/concepts/cluster-administration/logging#using-a-sidecar-container-with-the-logging-agent)
+see the [sidecar approach](/docs/concepts/cluster-administration/logging#sidecar-container-with-a-logging-agent)
 in the Kubernetes logging overview.

 ## Deploying
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - Random-Liu
 - dchen1107
 title: Monitor Node Health
@@ -1,8 +1,11 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: nginx-deployment
 spec:
+  selector:
+    matchLabels:
+      app: nginx
  replicas: 2
  template:
    metadata:
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - mikedanese
 title: Tools for Monitoring Compute, Storage, and Network Resources
 ---
@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - brendandburns
 - davidopp
 title: Troubleshooting