1.2 additions for getting-started-guides/ and new non-Markdown files for user-guides

docs/user-guide/configmap/README.md

@@ -0,0 +1,117 @@
+<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
+
+
+<!-- END MUNGE: UNVERSIONED_WARNING -->
+
+# ConfigMap example
+
+
+
+## Step Zero: Prerequisites
+
+This example assumes you have a Kubernetes cluster installed and running, and that you have
+installed the `kubectl` command line tool somewhere in your path. Please see the [getting
+started](../../../docs/getting-started-guides/) for installation instructions for your platform.
+
+## Step One: Create the ConfigMap
+
+A ConfigMap contains a set of named strings.
+
+Use the [`examples/configmap/configmap.yaml`](configmap.yaml) file to create a ConfigMap:
+
+```console
+$ kubectl create -f docs/user-guide/configmap/configmap.yaml
+```
+
+You can use `kubectl` to see information about the ConfigMap:
+
+```console
+$ kubectl get configmap
+NAME          DATA
+test-secret   2
+
+$ kubectl describe configMap test-configmap
+Name:          test-configmap
+Labels:        <none>
+Annotations:   <none>
+
+Data
+====
+data-1: 7 bytes
+data-2: 7 bytes
+```
+
+View the values of the keys with `kubectl get`:
+
+```console
+$ cluster/kubectl.sh get configmaps test-configmap -o yaml
+apiVersion: v1
+data:
+  data-1: value-1
+  data-2: value-2
+kind: ConfigMap
+metadata:
+  creationTimestamp: 2016-02-18T20:28:50Z
+  name: test-configmap
+  namespace: default
+  resourceVersion: "1090"
+  selfLink: /api/v1/namespaces/default/configmaps/test-configmap
+  uid: 384bd365-d67e-11e5-8cd0-68f728db1985
+```
+
+## Step Two: Create a pod that consumes a configMap in environment variables
+
+Use the [`examples/configmap/env-pod.yaml`](env-pod.yaml) file to create a Pod that consumes the
+ConfigMap in environment variables.
+
+```console
+$ kubectl create -f docs/user-guide/configmap/env-pod.yaml
+```
+
+This pod runs the `env` command to display the environment of the container:
+
+```console
+$ kubectl logs secret-test-pod
+KUBE_CONFIG_1=value-1
+KUBE_CONFIG_2=value-2
+```
+
+## Step Three: Create a pod that sets the command line using ConfigMap
+
+Use the [`examples/configmap/command-pod.yaml`](env-pod.yaml) file to create a Pod with a container
+whose command is injected with the keys of a ConfigMap
+
+```console
+$ kubectl create -f docs/user-guide/configmap/env-pod.yaml
+```
+
+This pod runs an `echo` command to display the keys:
+
+```console
+value-1 value-2
+```
+
+## Step Four: Create a pod that consumes a configMap in a volume
+
+Pods can also consume ConfigMaps in volumes.  Use the [`examples/configmap/volume-pod.yaml`](volume-pod.yaml) file to create a Pod that consume the ConfigMap in a volume.
+
+```console
+$ kubectl create -f docs/user-guide/configmap/volume-pod.yaml
+```
+
+This pod runs a `cat` command to print the value of one of the keys in the volume:
+
+```console
+value-1
+```
+
+
+
+<!-- BEGIN MUNGE: IS_VERSIONED -->
+<!-- TAG IS_VERSIONED -->
+<!-- END MUNGE: IS_VERSIONED -->
+
+
+<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/configmap/README.md?pixel)]()
+<!-- END MUNGE: GENERATED_ANALYTICS -->

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

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: config-cmd-test-pod
+spec:
+  containers:
+    - name: test-container
+      image: gcr.io/google_containers/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

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

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

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: config-env-test-pod
+spec:
+  containers:
+    - name: test-container
+      image: gcr.io/google_containers/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

@@ -0,0 +1,7 @@
+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

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

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

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

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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: config-volume-test-pod
+spec:
+  containers:
+    - name: test-container
+      image: gcr.io/google_containers/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/deployment.yaml

@@ -0,0 +1,21 @@
+apiVersion: extensions/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/horizontal-pod-autoscaling/hpa-php-apache.yaml

@@ -7,7 +7,7 @@ spec:
   scaleRef:
     kind: ReplicationController
     name: php-apache
-    namespace: default
+    subresource: scale
   minReplicas: 1
   maxReplicas: 10
   cpuUtilization:

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

@@ -1,3 +1,17 @@
+# 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

docs/user-guide/liveness/http-liveness.yaml

@@ -13,6 +13,9 @@ spec:
       httpGet:
         path: /healthz
         port: 8080
+        httpHeaders:
+          - name: X-Custom-Header
+            value: Awesome
       initialDelaySeconds: 15
       timeoutSeconds: 1
     name: liveness

docs/user-guide/liveness/image/Dockerfile

@@ -1,3 +1,17 @@
+# 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 scratch
 
 ADD server /server

docs/user-guide/liveness/image/Makefile

@@ -1,3 +1,17 @@
+# 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.
+
 all: push
 
 server: server.go

docs/user-guide/logging-demo/Makefile

@@ -1,10 +1,24 @@
+# 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.
+
 # Makefile for launching synthetic logging sources (any platform)
 # and for reporting the forwarding rules for the
 # Elasticsearch and Kibana pods for the GCE platform.
 # For examples of how to observe the ingested logs please
 # see the appropriate getting started guide e.g.
-# Google Cloud Logging: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/getting-started-guides/logging.md
-# With Elasticsearch and Kibana logging: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/getting-started-guides/logging-elasticsearch.md
+# Google Cloud Logging: https://github.com/kubernetes/kubernetes/blob/master/docs/getting-started-guides/logging.md
+# With Elasticsearch and Kibana logging: https://github.com/kubernetes/kubernetes/blob/master/docs/getting-started-guides/logging-elasticsearch.md
 
 .PHONY: up down logger-up logger-down logger10-up logger10-down
 

docs/user-guide/node-selection/pod-with-node-affinity.yaml

@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: with-labels
+  annotations:
+    scheduler.alpha.kubernetes.io/affinity: >
+      {
+        "nodeAffinity": {
+          "requiredDuringSchedulingIgnoredDuringExecution": {
+            "nodeSelectorTerms": [
+              {
+                "matchExpressions": [
+                  {
+                    "key": "kubernetes.io/e2e-az-name",
+                    "operator": "In",
+                    "values": ["e2e-az1", "e2e-az2"]
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      }
+    another-annotation-key: another-annotation-value
+spec:
+  containers:
+  - name: with-labels
+    image: gcr.io/google_containers/pause:2.0

docs/user-guide/persistent-volumes/simpletest/pod.yaml

@@ -12,7 +12,7 @@ spec:
         - containerPort: 80
           name: "http-server"
       volumeMounts:
-      - mountPath: "/var/www/html"
+      - mountPath: "/usr/share/nginx/html"
         name: mypd
   volumes:
     - name: mypd

docs/user-guide/persistent-volumes/volumes/local-01.yaml

@@ -10,4 +10,4 @@ spec:
   accessModes:
     - ReadWriteOnce
   hostPath:
-    path: "/tmp/data01"
+    path: "/somepath/data01"

docs/user-guide/persistent-volumes/volumes/local-02.yaml

@@ -10,5 +10,5 @@ spec:
   accessModes:
     - ReadWriteOnce
   hostPath:
-    path: "/tmp/data02"
+    path: "/somepath/data02"
   persistentVolumeReclaimPolicy: Recycle

docs/user-guide/persistent-volumes/volumes/nfs.yaml

@@ -8,5 +8,5 @@ spec:
   accessModes:
     - ReadWriteOnce
   nfs:
-    path: /tmp
+    path: /somepath
     server: 172.17.0.2

docs/user-guide/replicaset/frontend.yaml

@@ -0,0 +1,42 @@
+apiVersion: extensions/v1beta1
+kind: ReplicaSet
+metadata:
+  name: frontend
+  # these labels can be applied automatically
+  # from the labels in the pod template if not set
+  # labels:
+    # app: guestbook
+    # tier: frontend
+spec:
+  # this replicas value is default
+  # modify it according to your case
+  replicas: 3
+  # selector can be applied automatically
+  # from the labels in the pod template if not set
+  # selector:
+  #   matchLabels:
+  #     app: guestbook
+  #     tier: frontend
+  template:
+    metadata:
+      labels:
+        app: guestbook
+        tier: frontend
+    spec:
+      containers:
+      - name: php-redis
+        image: gcr.io/google_samples/gb-frontend:v3
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        env:
+        - name: GET_HOSTS_FROM
+          value: dns
+          # If your cluster config does not include a dns service, then to
+          # instead access environment variables to find service host
+          # info, comment out the 'value: dns' line above, and uncomment the
+          # line below.
+          # value: env
+        ports:
+        - containerPort: 80

docs/user-guide/replicaset/redis-slave.yaml

@@ -0,0 +1,44 @@
+apiVersion: extensions/v1beta1
+kind: ReplicaSet
+metadata:
+  name: redis-slave
+  # these labels can be applied automatically
+  # from the labels in the pod template if not set
+  # labels:
+  #   app: redis
+  #   role: slave
+  #   tier: backend
+spec:
+  # this replicas value is default
+  # modify it according to your case
+  replicas: 2
+  # selector can be applied automatically
+  # from the labels in the pod template if not set
+  # selector:
+  #   app: guestbook
+  #   role: slave
+  #   tier: backend
+  template:
+    metadata:
+      labels:
+        app: redis
+        role: slave
+        tier: backend
+    spec:
+      containers:
+      - name: slave
+        image: gcr.io/google_samples/gb-redisslave:v1
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        env:
+        - name: GET_HOSTS_FROM
+          value: dns
+          # If your cluster config does not include a dns service, then to
+          # instead access an environment variable to find the master
+          # service's host, comment out the 'value: dns' line above, and
+          # uncomment the line below.
+          # value: env
+        ports:
+        - containerPort: 6379

docs/user-guide/secrets/secret-env-pod.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: secret-env-pod
+spec:
+  containers:
+    - name: test-container
+      image: gcr.io/google_containers/busybox
+      command: [ "/bin/sh", "-c", "env" ]
+      env:
+        - name: MY_SECRET_DATA
+          valueFrom:
+            secretKeyRef:
+              name: test-secret
+              key: data-1
+  restartPolicy: Never

docs/user-guide/update-demo/images/kitten/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2014 Google Inc. All rights reserved.
+# 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.

docs/user-guide/update-demo/images/nautilus/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2014 Google Inc. All rights reserved.
+# 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.