merge master to 1.10, with fixes (#7682)

docs/user-guide/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - erictune
 - janetkuo
 - satnam6502

docs/user-guide/bad-nginx-deployment.yaml

@@ -1,16 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.91
-        ports:
-        - containerPort: 80

docs/user-guide/configmap/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - dchen1107
 - pmorie
 

docs/user-guide/configmap/command-pod.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: config-cmd-test-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "/bin/sh", "-c", "echo $(KUBE_CONFIG_1) $(KUBE_CONFIG_2)" ]
-      env:
-        - name: KUBE_CONFIG_1
-          valueFrom:
-            configMapKeyRef:
-              name: test-configmap
-              key: data-1
-        - name: KUBE_CONFIG_2
-          valueFrom:
-            configMapKeyRef:
-              name: test-configmap
-              key: data-2
-  restartPolicy: Never

docs/user-guide/configmap/configmap.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: test-configmap
-data:
-  data-1: value-1
-  data-2: value-2

docs/user-guide/configmap/env-pod.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: config-env-test-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "/bin/sh", "-c", "env" ]
-      env:
-        - name: KUBE_CONFIG_1
-          valueFrom:
-            configMapKeyRef:
-              name: test-configmap
-              key: data-1
-        - name: KUBE_CONFIG_2
-          valueFrom:
-            configMapKeyRef:
-              name: test-configmap
-              key: data-2
-  restartPolicy: Never

docs/user-guide/configmap/kubectl/game.properties

@@ -1,7 +0,0 @@
-enemies=aliens
-lives=3
-enemies.cheat=true
-enemies.cheat.level=noGoodRotten
-secret.code.passphrase=UUDDLRLRBABAS
-secret.code.allowed=true
-secret.code.lives=30

docs/user-guide/configmap/kubectl/ui.properties

@@ -1,4 +0,0 @@
-color.good=purple
-color.bad=yellow
-allow.textmode=true
-how.nice.to.look=fairlyNice

docs/user-guide/configmap/mount-file-pod.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: config-single-file-volume-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "/bin/sh", "-c", "cat /etc/special-key" ]
-      volumeMounts:
-      - name: config-volume
-        mountPath: /etc/special-key
-        subPath: path/to/special-key
-  volumes:
-    - name: config-volume
-      configMap:
-        name: test-configmap
-        items:
-        - key: data-1
-          path: path/to/special-key
-  restartPolicy: Never

docs/user-guide/configmap/redis/redis-config

@@ -1,2 +0,0 @@
-maxmemory 2mb
-maxmemory-policy allkeys-lru

docs/user-guide/configmap/redis/redis-pod.yaml

@@ -1,30 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: redis
-spec:
-  containers:
-  - name: redis
-    image: kubernetes/redis:v1
-    env:
-    - name: MASTER
-      value: "true"
-    ports:
-    - containerPort: 6379
-    resources:
-      limits:
-        cpu: "0.1"
-    volumeMounts:
-    - mountPath: /redis-master-data
-      name: data
-    - mountPath: /redis-master
-      name: config
-  volumes:
-    - name: data
-      emptyDir: {}
-    - name: config
-      configMap:
-        name: example-redis-config
-        items:
-        - key: redis-config
-          path: redis.conf

docs/user-guide/configmap/volume-pod.yaml

@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: config-volume-test-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "/bin/sh", "-c", "cat /etc/config/path/to/special-key" ]
-      volumeMounts:
-      - name: config-volume
-        mountPath: /etc/config
-  volumes:
-    - name: config-volume
-      configMap:
-        name: test-configmap
-        items:
-        - key: data-1
-          path: path/to/special-key
-  restartPolicy: Never

docs/user-guide/curlpod.yaml

@@ -1,25 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: curl-deployment
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: curlpod
-    spec:
-      volumes:
-      - name: secret-volume
-        secret:
-          secretName: nginxsecret
-      containers:
-      - name: curlpod
-        command:
-        - sh
-        - -c
-        - while true; do sleep 1; done
-        image: radial/busyboxplus:curl
-        volumeMounts:
-        - mountPath: /etc/nginx/ssl
-          name: secret-volume

docs/user-guide/deployment.yaml

@@ -1,21 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-  labels:
-    name: nginx-deployment
-spec:
-  replicas: 3
-  selector:
-    matchLabels:
-      name: nginx
-  template:
-    metadata:
-      labels:
-        name: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-        ports:
-        - containerPort: 80

docs/user-guide/downward-api/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - bgrant0607
 - mikedanese
 

docs/user-guide/downward-api/dapi-container-resources.yaml

@@ -1,34 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: dapi-test-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox:1.24
-      command: [ "/bin/sh", "-c", "env" ]
-      resources:
-        requests:
-          memory: "32Mi"
-          cpu: "125m"
-        limits:
-          memory: "64Mi"
-          cpu: "250m"
-      env:
-        - name: MY_CPU_REQUEST
-          valueFrom:
-            resourceFieldRef:
-              resource: requests.cpu
-        - name: MY_CPU_LIMIT
-          valueFrom:
-            resourceFieldRef:
-              resource: limits.cpu
-        - name: MY_MEM_REQUEST
-          valueFrom:
-            resourceFieldRef:
-              resource: requests.memory
-        - name: MY_MEM_LIMIT
-          valueFrom:
-            resourceFieldRef:
-              resource: limits.memory
-  restartPolicy: Never

docs/user-guide/downward-api/dapi-pod.yaml

@@ -1,31 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: dapi-test-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "/bin/sh", "-c", "env" ]
-      env:
-        - name: MY_NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
-        - name: MY_POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: MY_POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: MY_POD_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        - name: MY_POD_SERVICE_ACCOUNT
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.serviceAccountName
-  restartPolicy: Never

docs/user-guide/downward-api/volume/dapi-volume-resources.yaml

@@ -1,40 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kubernetes-downwardapi-volume-example
-spec:
-  containers:
-    - name: client-container
-      image: k8s.gcr.io/busybox:1.24
-      command: ["sh", "-c", "while true; do echo; if [[ -e /etc/cpu_limit ]]; then cat /etc/cpu_limit; fi; if [[ -e /etc/cpu_request ]]; then cat /etc/cpu_request; fi; if [[ -e /etc/mem_limit ]]; then cat /etc/mem_limit; fi; if [[ -e /etc/mem_request ]]; then cat /etc/mem_request; fi; sleep 5; done"]
-      resources:
-        requests:
-          memory: "32Mi"
-          cpu: "125m"
-        limits:
-          memory: "64Mi"
-          cpu: "250m"
-      volumeMounts:
-        - name: podinfo
-          mountPath: /etc
-          readOnly: false
-  volumes:
-    - name: podinfo
-      downwardAPI:
-        items:
-          - path: "cpu_limit"
-            resourceFieldRef:
-              containerName: client-container
-              resource: limits.cpu
-          - path: "cpu_request"
-            resourceFieldRef:
-              containerName: client-container
-              resource: requests.cpu
-          - path: "mem_limit"
-            resourceFieldRef:
-              containerName: client-container
-              resource: limits.memory
-          - path: "mem_request"
-            resourceFieldRef:
-              containerName: client-container
-              resource: requests.memory

docs/user-guide/downward-api/volume/dapi-volume.yaml

@@ -1,30 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kubernetes-downwardapi-volume-example
-  labels:
-    zone: us-est-coast
-    cluster: test-cluster1
-    rack: rack-22
-  annotations:
-    build: two
-    builder: john-doe
-spec:
-  containers:
-    - name: client-container
-      image: k8s.gcr.io/busybox
-      command: ["sh", "-c", "while true; do if [[ -e /etc/labels ]]; then cat /etc/labels; fi; if [[ -e /etc/annotations ]]; then cat /etc/annotations; fi; sleep 5; done"]
-      volumeMounts:
-        - name: podinfo
-          mountPath: /etc
-          readOnly: false
-  volumes:
-    - name: podinfo
-      downwardAPI:
-        items:
-          - path: "labels"
-            fieldRef:
-              fieldPath: metadata.labels
-          - path: "annotations"
-            fieldRef:
-              fieldPath: metadata.annotations

docs/user-guide/environment-guide/OWNERS

@@ -1,3 +1,3 @@
-approvers:
+reviewers:
 - mikedanese
 

docs/user-guide/environment-guide/backend-rc.yaml

@@ -1,29 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: backend-rc
-  labels:
-    type: backend-type
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        type: backend-type
-    spec:
-      containers:
-      - name: backend-container
-        image: gcr.io/google-samples/env-backend:1.1
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 5000
-          protocol: TCP
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace

docs/user-guide/environment-guide/backend-srv.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: backend-srv
-  labels:
-    type: backend-type
-spec:
-  ports:
-  - port: 5000
-    protocol: TCP
-  selector:
-    type: backend-type

docs/user-guide/environment-guide/containers/backend/Dockerfile

@@ -1,2 +0,0 @@
-FROM golang:onbuild
-EXPOSE 8080

docs/user-guide/environment-guide/containers/backend/backend.go

@@ -1,37 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-)
-
-func printInfo(resp http.ResponseWriter, req *http.Request) {
-	name := os.Getenv("POD_NAME")
-	namespace := os.Getenv("POD_NAMESPACE")
-	fmt.Fprintf(resp, "Backend Container\n")
-	fmt.Fprintf(resp, "Backend Pod Name: %v\n", name)
-	fmt.Fprintf(resp, "Backend Namespace: %v\n", namespace)
-}
-
-func main() {
-	http.HandleFunc("/", printInfo)
-	log.Fatal(http.ListenAndServe(":5000", nil))
-}

docs/user-guide/environment-guide/containers/show/Dockerfile

@@ -1,2 +0,0 @@
-FROM golang:onbuild
-EXPOSE 8080

docs/user-guide/environment-guide/containers/show/show.go

@@ -1,95 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"os"
-	"sort"
-	"strings"
-)
-
-func getKubeEnv() (map[string]string, error) {
-	environS := os.Environ()
-	environ := make(map[string]string)
-	for _, val := range environS {
-		split := strings.Split(val, "=")
-		if len(split) != 2 {
-			return environ, fmt.Errorf("Some weird env vars")
-		}
-		environ[split[0]] = split[1]
-	}
-	for key := range environ {
-		if !(strings.HasSuffix(key, "_SERVICE_HOST") ||
-			strings.HasSuffix(key, "_SERVICE_PORT")) {
-			delete(environ, key)
-		}
-	}
-	return environ, nil
-}
-
-func printInfo(resp http.ResponseWriter, req *http.Request) {
-	kubeVars, err := getKubeEnv()
-	if err != nil {
-		http.Error(resp, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	backendHost := os.Getenv("BACKEND_SRV_SERVICE_HOST")
-	backendPort := os.Getenv("BACKEND_SRV_SERVICE_PORT")
-	backendRsp, backendErr := http.Get(fmt.Sprintf(
-		"http://%v:%v/",
-		backendHost,
-		backendPort))
-	if backendErr == nil {
-		defer backendRsp.Body.Close()
-	}
-
-	name := os.Getenv("POD_NAME")
-	namespace := os.Getenv("POD_NAMESPACE")
-	fmt.Fprintf(resp, "Pod Name: %v \n", name)
-	fmt.Fprintf(resp, "Pod Namespace: %v \n", namespace)
-
-	envvar := os.Getenv("USER_VAR")
-	fmt.Fprintf(resp, "USER_VAR: %v \n", envvar)
-
-	fmt.Fprintf(resp, "\nKubernetes environment variables\n")
-	var keys []string
-	for key := range kubeVars {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-	for _, key := range keys {
-		fmt.Fprintf(resp, "%v = %v \n", key, kubeVars[key])
-	}
-
-	fmt.Fprintf(resp, "\nFound backend ip: %v port: %v\n", backendHost, backendPort)
-	if backendErr == nil {
-		fmt.Fprintf(resp, "Response from backend\n")
-		io.Copy(resp, backendRsp.Body)
-	} else {
-		fmt.Fprintf(resp, "Error from backend: %v", backendErr.Error())
-	}
-}
-
-func main() {
-	http.HandleFunc("/", printInfo)
-	log.Fatal(http.ListenAndServe(":8080", nil))
-}

docs/user-guide/environment-guide/show-rc.yaml

@@ -1,31 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: show-rc
-  labels:
-    type: show-type
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        type: show-type
-    spec:
-      containers:
-      - name: show-container
-        image: gcr.io/google-samples/env-show:1.1
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8080
-          protocol: TCP
-        env:
-        - name: USER_VAR
-          value: important information
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace

docs/user-guide/environment-guide/show-srv.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: show-srv
-  labels:
-    type: show-type
-spec:
-  type: LoadBalancer
-  ports:
-  - port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    type: show-type

docs/user-guide/federation/OWNERS

@@ -1,3 +1,3 @@
-approvers:
+reviewers:
 - quinton-hoole
 

docs/user-guide/horizontal-pod-autoscaling/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - fgrzadkowski
 - janetkuo
 - jszczepkowski

docs/user-guide/horizontal-pod-autoscaling/hpa-php-apache.yaml

@@ -1,13 +0,0 @@
-apiVersion: autoscaling/v1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: php-apache
-  namespace: default
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1beta1
-    kind: Deployment
-    name: php-apache
-  minReplicas: 1
-  maxReplicas: 10
-  targetCPUUtilizationPercentage: 50

docs/user-guide/horizontal-pod-autoscaling/image/Dockerfile

@@ -1,19 +0,0 @@
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM php:5-apache
-
-ADD index.php /var/www/html/index.php
-
-RUN chmod a+rx index.php

docs/user-guide/horizontal-pod-autoscaling/image/index.php

@@ -1,7 +0,0 @@
-<?php
-$x = 0.0001;
-for ($i = 0; $i <= 1000000; $i++) {
-	$x += sqrt($x);
-}
-echo "OK!";
-?>

docs/user-guide/ingress.yaml

@@ -1,9 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: test-ingress
-spec:
-  backend:
-    serviceName: testsvc
-    servicePort: 80
-

docs/user-guide/job.yaml

@@ -1,15 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: pi
-spec:
-  template:
-    metadata:
-      name: pi
-    spec:
-      containers:
-      - name: pi
-        image: perl
-        command: ["perl",  "-Mbignum=bpi", "-wle", "print bpi(2000)"]
-      restartPolicy: Never
-

docs/user-guide/jobs/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - caesarxuchao
 - erictune
 - soltysh

docs/user-guide/jobs/expansions/job.yaml.txt

@@ -1,18 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: process-item-$ITEM
-  labels:
-    jobgroup: jobexample
-spec:
-  template:
-    metadata:
-      name: jobexample
-      labels:
-        jobgroup: jobexample
-    spec:
-      containers:
-      - name: c
-        image: busybox
-        command: ["sh", "-c", "echo Processing item $ITEM && sleep 5"]
-      restartPolicy: Never

docs/user-guide/jobs/work-queue-1/Dockerfile

@@ -1,10 +0,0 @@
-# Specify BROKER_URL and QUEUE when running
-FROM ubuntu:14.04
-
-RUN apt-get update && \
-    apt-get install -y curl ca-certificates amqp-tools python \
-       --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/*
-COPY ./worker.py /worker.py
-
-CMD  /usr/bin/amqp-consume --url=$BROKER_URL -q $QUEUE -c 1 /worker.py

docs/user-guide/jobs/work-queue-1/job.yaml

@@ -1,20 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: job-wq-1
-spec:
-  completions: 8
-  parallelism: 2
-  template:
-    metadata:
-      name: job-wq-1
-    spec:
-      containers:
-      - name: c
-        image: gcr.io/<project>/job-wq-1
-        env:
-        - name: BROKER_URL
-          value: amqp://guest:guest@rabbitmq-service:5672
-        - name: QUEUE
-          value: job1
-      restartPolicy: OnFailure

docs/user-guide/jobs/work-queue-1/worker.py

@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-# Just prints standard out and sleeps for 10 seconds.
-import sys
-import time
-print("Processing " + sys.stdin.lines())
-time.sleep(10)

docs/user-guide/jobs/work-queue-2/Dockerfile

@@ -1,6 +0,0 @@
-FROM python
-RUN pip install redis
-COPY ./worker.py /worker.py
-COPY ./rediswq.py /rediswq.py
-
-CMD  python worker.py

docs/user-guide/jobs/work-queue-2/job.yaml

@@ -1,14 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: job-wq-2
-spec:
-  parallelism: 2
-  template:
-    metadata:
-      name: job-wq-2
-    spec:
-      containers:
-      - name: c
-        image: gcr.io/myproject/job-wq-2
-      restartPolicy: OnFailure

docs/user-guide/jobs/work-queue-2/redis-pod.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: redis-master
-  labels:
-    app: redis
-spec:
-  containers:
-    - name: master
-      image: redis
-      env:
-        - name: MASTER
-          value: "true"
-      ports:
-        - containerPort: 6379

docs/user-guide/jobs/work-queue-2/redis-service.yaml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-spec:
-  ports:
-  - port: 6379
-    targetPort: 6379
-  selector:
-    app: redis

docs/user-guide/jobs/work-queue-2/rediswq.py

@@ -1,130 +0,0 @@
-#!/usr/bin/env python
-
-# Based on http://peter-hoffmann.com/2012/python-simple-queue-redis-queue.html 
-# and the suggestion in the redis documentation for RPOPLPUSH, at 
-# http://redis.io/commands/rpoplpush, which suggests how to implement a work-queue.
-
- 
-import redis
-import uuid
-import hashlib
-
-class RedisWQ(object):
-    """Simple Finite Work Queue with Redis Backend
-
-    This work queue is finite: as long as no more work is added
-    after workers start, the workers can detect when the queue
-    is completely empty.
-
-    The items in the work queue are assumed to have unique values.
-
-    This object is not intended to be used by multiple threads
-    concurrently.
-    """
-    def __init__(self, name, **redis_kwargs):
-       """The default connection parameters are: host='localhost', port=6379, db=0
-
-       The work queue is identified by "name".  The library may create other
-       keys with "name" as a prefix. 
-       """
-       self._db = redis.StrictRedis(**redis_kwargs)
-       # The session ID will uniquely identify this "worker".
-       self._session = str(uuid.uuid4())
-       # Work queue is implemented as two queues: main, and processing.
-       # Work is initially in main, and moved to processing when a client picks it up.
-       self._main_q_key = name
-       self._processing_q_key = name + ":processing"
-       self._lease_key_prefix = name + ":leased_by_session:"
-
-    def sessionID(self):
-        """Return the ID for this session."""
-        return self._session
-
-    def _main_qsize(self):
-        """Return the size of the main queue."""
-        return self._db.llen(self._main_q_key)
-
-    def _processing_qsize(self):
-        """Return the size of the main queue."""
-        return self._db.llen(self._processing_q_key)
-
-    def empty(self):
-        """Return True if the queue is empty, including work being done, False otherwise.
-
-        False does not necessarily mean that there is work available to work on right now,
-        """
-        return self._main_qsize() == 0 and self._processing_qsize() == 0
-
-# TODO: implement this
-#    def check_expired_leases(self):
-#        """Return to the work queueReturn True if the queue is empty, False otherwise."""
-#        # Processing list should not be _too_ long since it is approximately as long
-#        # as the number of active and recently active workers.
-#        processing = self._db.lrange(self._processing_q_key, 0, -1)
-#        for item in processing:
-#          # If the lease key is not present for an item (it expired or was 
-#          # never created because the client crashed before creating it)
-#          # then move the item back to the main queue so others can work on it.
-#          if not self._lease_exists(item):
-#            TODO: transactionally move the key from processing queue to
-#            to main queue, while detecting if a new lease is created
-#            or if either queue is modified.
-
-    def _itemkey(self, item):
-        """Returns a string that uniquely identifies an item (bytes)."""
-        return hashlib.sha224(item).hexdigest()
-
-    def _lease_exists(self, item):
-        """True if a lease on 'item' exists."""
-        return self._db.exists(self._lease_key_prefix + self._itemkey(item))
-
-    def lease(self, lease_secs=60, block=True, timeout=None):
-        """Begin working on an item the work queue. 
-
-        Lease the item for lease_secs.  After that time, other
-        workers may consider this client to have crashed or stalled
-        and pick up the item instead.
-
-        If optional args block is true and timeout is None (the default), block
-        if necessary until an item is available."""
-        if block:
-            item = self._db.brpoplpush(self._main_q_key, self._processing_q_key, timeout=timeout)
-        else:
-            item = self._db.rpoplpush(self._main_q_key, self._processing_q_key)
-        if item:
-            # Record that we (this session id) are working on a key.  Expire that
-            # note after the lease timeout.
-            # Note: if we crash at this line of the program, then GC will see no lease
-            # for this item a later return it to the main queue.
-            itemkey = self._itemkey(item)
-            self._db.setex(self._lease_key_prefix + itemkey, lease_secs, self._session)
-        return item
-
-    def complete(self, value):
-        """Complete working on the item with 'value'.
-
-        If the lease expired, the item may not have completed, and some
-        other worker may have picked it up.  There is no indication
-        of what happened.
-        """
-        self._db.lrem(self._processing_q_key, 0, value)
-        # If we crash here, then the GC code will try to move the value, but it will
-        # not be here, which is fine.  So this does not need to be a transaction.
-        itemkey = self._itemkey(value)
-        self._db.delete(self._lease_key_prefix + itemkey, self._session)
-
-# TODO: add functions to clean up all keys associated with "name" when
-# processing is complete.
-
-# TODO: add a function to add an item to the queue.  Atomically
-# check if the queue is empty and if so fail to add the item
-# since other workers might think work is done and be in the process
-# of exiting.
-
-# TODO(etune): move to my own github for hosting, e.g. github.com/erictune/rediswq-py and
-# make it so it can be pip installed by anyone (see
-# http://stackoverflow.com/questions/8247605/configuring-so-that-pip-install-can-work-from-github)
-
-# TODO(etune): finish code to GC expired leases, and call periodically
-#  e.g. each time lease times out.
-

docs/user-guide/jobs/work-queue-2/worker.py

@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-
-import time
-import rediswq
-
-host="redis"
-# Uncomment next two lines if you do not have Kube-DNS working.
-# import os
-# host = os.getenv("REDIS_SERVICE_HOST")
-
-q = rediswq.RedisWQ(name="job2", host="redis")
-print("Worker with sessionID: " +  q.sessionID())
-print("Initial queue state: empty=" + str(q.empty()))
-while not q.empty():
-  item = q.lease(lease_secs=10, block=True, timeout=2) 
-  if item is not None:
-    itemstr = item.decode("utf=8")
-    print("Working on " + itemstr)
-    time.sleep(10) # Put your actual work here instead of sleep.
-    q.complete(item)
-  else:
-    print("Waiting for work")
-print("Queue empty, exiting")

docs/user-guide/liveness/OWNERS

@@ -1,3 +1,3 @@
-approvers:
+reviewers:
 - mikedanese
 

docs/user-guide/multi-pod.yaml

@@ -1,48 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    name: redis
-    redis-sentinel: "true"
-    role: master
-  name: redis-master
-spec:
-  containers:
-    - name: master
-      image: kubernetes/redis:v1
-      env:
-        - name: MASTER
-          value: "true"
-      ports:
-        - containerPort: 6379
-      resources:
-        limits:
-          cpu: "0.5"
-      volumeMounts:
-        - mountPath: /redis-master-data
-          name: data
-    - name: sentinel
-      image: kubernetes/redis:v1
-      env:
-        - name: SENTINEL
-          value: "true"
-      ports:
-        - containerPort: 26379
-  volumes:
-    - name: data
-      emptyDir: {}
----
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    name: redis-proxy
-    role: proxy
-  name: redis-proxy
-spec:
-  containers:
-  - name: proxy
-    image: kubernetes/redis-proxy:v1
-    ports:
-    - containerPort: 6379
-      name: api

docs/user-guide/new-nginx-deployment.yaml

@@ -1,16 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.9.1
-        ports:
-        - containerPort: 80

docs/user-guide/nginx-app.yaml

@@ -1,29 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: my-nginx-svc
-  labels:
-    app: nginx
-spec:
-  type: LoadBalancer
-  ports:
-  - port: 80
-  selector:
-    app: nginx
----
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: my-nginx
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.7.9
-        ports:
-        - containerPort: 80

docs/user-guide/nginx-deployment.yaml

@@ -1,16 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.7.9
-        ports:
-        - containerPort: 80

docs/user-guide/nginx-init-containers.yaml

@@ -1,29 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: nginx
-spec:
-  containers:
-  - name: nginx
-    image: nginx
-    ports:
-    - containerPort: 80
-    volumeMounts:
-    - name: workdir
-      mountPath: /usr/share/nginx/html
-  # These containers are run during pod initialization
-  initContainers:
-  - name: install
-    image: busybox
-    command:
-    - wget
-    - "-O"
-    - "/work-dir/index.html"
-    - http://kubernetes.io/index.html
-    volumeMounts:
-    - name: workdir
-      mountPath: "/work-dir"
-  dnsPolicy: Default
-  volumes:
-  - name: workdir
-    emptyDir: {}

docs/user-guide/nginx-lifecycle-deployment.yaml

@@ -1,20 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-        ports:
-        - containerPort: 80
-        lifecycle:
-          preStop:
-            exec:
-              # SIGTERM triggers a quick exit; gracefully terminate instead
-              command: ["/usr/sbin/nginx","-s","quit"]

docs/user-guide/nginx-probe-deployment.yaml

@@ -1,22 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-        ports:
-        - containerPort: 80
-        livenessProbe:
-          httpGet:
-            # Path to probe; should be cheap, but representative of typical behavior
-            path: /index.html
-            port: 80
-          initialDelaySeconds: 30
-          timeoutSeconds: 1

docs/user-guide/nginx-secure-app.yaml

@@ -1,43 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: my-nginx
-  labels:
-    run: my-nginx
-spec:
-  type: NodePort
-  ports:
-  - port: 8080
-    targetPort: 80
-    protocol: TCP
-    name: http
-  - port: 443
-    protocol: TCP
-    name: https
-  selector:
-    run: my-nginx
----
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: my-nginx
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        run: my-nginx
-    spec:
-      volumes:
-      - name: secret-volume
-        secret:
-          secretName: nginxsecret
-      containers:
-      - name: nginxhttps
-        image: bprashanth/nginxhttps:1.0
-        ports:
-        - containerPort: 443
-        - containerPort: 80
-        volumeMounts:
-        - mountPath: /etc/nginx/ssl
-          name: secret-volume

docs/user-guide/nginx-svc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: my-nginx
-  labels:
-    run: my-nginx
-spec:
-  ports:
-  - port: 80
-    protocol: TCP
-  selector:
-    run: my-nginx

docs/user-guide/nginx/OWNERS

@@ -1,3 +1,3 @@
-approvers:
+reviewers:
 - janetkuo
 

docs/user-guide/nginx/nginx-deployment.yaml

@@ -1,16 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: my-nginx
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.7.9
-        ports:
-        - containerPort: 80

docs/user-guide/nginx/nginx-svc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: my-nginx-svc
-  labels:
-    app: nginx
-spec:
-  type: LoadBalancer
-  ports:
-  - port: 80
-  selector:
-    app: nginx

docs/user-guide/node-selection/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - dchen1107
 - mikedanese
 

docs/user-guide/persistent-volumes/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - jsafrane
 - mikedanese
 - saad-ali

docs/user-guide/pod-preset/OWNERS

@@ -1,2 +1,2 @@
-approvers:
+reviewers:
 - jessfraz

docs/user-guide/pod-w-message.yaml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: pod-w-message
-spec:
-  containers:
-  - name: messager
-    image: "ubuntu:14.04"
-    command: ["/bin/sh","-c"]
-    args: ["sleep 60 && /bin/echo Sleep expired > /dev/termination-log"]

docs/user-guide/pod.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: nginx
-  labels:
-    app: nginx
-spec:
-  containers:
-  - name: nginx
-    image: nginx
-    ports:
-    - containerPort: 80

docs/user-guide/projected-volume/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - jpeeler
 - pmorie
 

docs/user-guide/redis-deployment.yaml

@@ -1,24 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: redis
-spec:
-  template:
-    metadata:
-      labels:
-        app: redis
-        tier: backend
-    spec:
-      # Provision a fresh volume for the pod
-      volumes:
-        - name: data
-          emptyDir: {}
-      containers:
-      - name: redis
-        image: kubernetes/redis:v1
-        ports:
-        - containerPort: 6379
-        # Mount the volume into the pod
-        volumeMounts:
-        - mountPath: /redis-master-data
-          name: data   # must match the name of the volume, above

docs/user-guide/redis-resource-deployment.yaml

@@ -1,27 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: redis
-spec:
-  template:
-    metadata:
-      labels:
-        app: redis
-        tier: backend
-    spec:
-      containers:
-      - name: redis
-        image: kubernetes/redis:v1
-        ports:
-        - containerPort: 80
-        resources:
-          limits:
-            # cpu units are cores
-            cpu: 500m
-            # memory units are bytes
-            memory: 64Mi
-          requests:
-            # cpu units are cores
-            cpu: 500m
-            # memory units are bytes
-            memory: 64Mi

docs/user-guide/redis-secret-deployment.yaml

@@ -1,27 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: redis
-spec:
-  template:
-    metadata:
-      labels:
-        app: redis
-        tier: backend
-    spec:
-      volumes:
-        - name: data
-          emptyDir: {}
-        - name: supersecret # The "mysecret" secret populates this "supersecret" volume.
-          secret:
-            secretName: mysecret
-      containers:
-      - name: redis
-        image: kubernetes/redis:v1
-        ports:
-        - containerPort: 6379
-        volumeMounts:
-        - mountPath: /redis-master-data
-          name: data
-        - mountPath: /var/run/secrets/super # Mount the "supersecret" volume into the pod.
-          name: supersecret

docs/user-guide/replicasets/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - bprashanth
 - madhusudancs
 

docs/user-guide/run-my-nginx.yaml

@@ -1,8 +1,11 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: my-nginx
 spec:
+  selector:
+    matchLabels:
+      run: my-nginx
   replicas: 2
   template:
     metadata:

docs/user-guide/secrets/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - mikedanese
 - pmorie
 

docs/user-guide/services/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - bprashanth
 - janetkuo
 - mikedanese

docs/user-guide/update-demo/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - janetkuo
 - mikedanese
 

docs/user-guide/update-demo/index.md.orig

@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - mikedanese
 title: Rolling Update Demo
 ---

docs/user-guide/update-demo/local/index.html

@@ -18,7 +18,7 @@ limitations under the License.
 <head>
   <script src="angular.min.js"></script>
   <script src="script.js"></script>
-  <link rel="stylesheet" href="style.css"></link>
+  <link rel="stylesheet" href="style.css">
 </head>
 <body ng-controller="ButtonsCtrl">
   <div ng-repeat="server in servers" class="pod">

docs/user-guide/walkthrough/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - eparis
 - janetkuo
 - mikedanese

docs/user-guide/walkthrough/deployment-update.yaml

@@ -1,8 +1,11 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment
 spec:
+  selector:
+    matchLabels:
+      app: nginx
   replicas: 2
   template:
     metadata:

docs/user-guide/walkthrough/deployment.yaml

@@ -1,8 +1,11 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment
 spec:
+  selector:
+    matchLabels:
+      app: nginx
   replicas: 2 # tells deployment to run 2 pods matching the template
   template: # create pods using pod definition in this template
     metadata:

docs/user-guide/walkthrough/index.md

@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - eparis
 - mikedanese
 title: Kubernetes 101

docs/user-guide/walkthrough/k8s201.md

@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - janetkuo
 - mikedanese
 title: Kubernetes 201