Merge pull request #8099 from ddysher/fix-downward-api

Fix downward API

examples/cassandra/cassandra-controller.yaml

@@ -1,42 +1,39 @@
 apiVersion: v1beta3
 kind: ReplicationController
-metadata: 
+metadata:
-  labels: 
+  labels:
     name: cassandra
   name: cassandra
-spec: 
+spec:
   replicas: 1
-  selector: 
+  selector:
     name: cassandra
-  template: 
+  template:
-    metadata: 
+    metadata:
-      labels: 
+      labels:
         name: cassandra
-    spec: 
+    spec:
-      containers: 
+      containers:
-        - command: 
+        - command:
             - /run.sh
           resources:
             limits:
               cpu: 1
-          env: 
+          env:
             - name: MAX_HEAP_SIZE
-              key: MAX_HEAP_SIZE
               value: 512M
             - name: HEAP_NEWSIZE
-              key: HEAP_NEWSIZE
               value: 100M
           image: "kubernetes/cassandra:v2"
           name: cassandra
-          ports: 
+          ports:
             - containerPort: 9042
               name: cql
             - containerPort: 9160
               name: thrift
-          volumeMounts: 
+          volumeMounts:
             - mountPath: /cassandra_data
               name: data
-      volumes: 
+      volumes:
         - name: data
           emptyDir: {}
-

examples/cassandra/cassandra-service.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1beta3
 kind: Service
-metadata: 
+metadata:
-  labels: 
+  labels:
     name: cassandra
   name: cassandra
-spec: 
+spec:
   ports:
     - port: 9042
       targetPort: 9042
-  selector: 
+  selector:
     name: cassandra

examples/cassandra/cassandra.yaml

@@ -10,7 +10,7 @@ spec:
     - /run.sh
     resources:
       limits:
-        cpu: "1"      
+        cpu: "1"
     image: kubernetes/cassandra:v2
     name: cassandra
     ports:
@@ -31,5 +31,3 @@ spec:
   volumes:
     - name: data
       emptyDir: {}
-
-    

examples/downward-api/README.md

@@ -14,7 +14,7 @@ started](../../docs/getting-started-guides) for installation instructions for yo
 Containers consume the downward API using environment variables.  The downward API allows
 containers to be injected with the name and namespace of the pod the container is in.
 
-Use the `examples/secrets/secret-pod.yaml` file to create a Pod with a container that consumes the
+Use the `examples/downward-api/dapi-pod.yaml` file to create a Pod with a container that consumes the
 downward API.
 
 ```shell