Merge pull request #15136 from jijun2/update-1006

examples/explorer/README.md

@@ -42,12 +42,12 @@ Currently, you can look at:
  * The filesystem to make sure the mounted volumes and files are also what you expect.
  * Perform DNS lookups, to see how DNS works.
 
-`pod.json` is supplied as an example. You can control the port it serves on with the -port flag.
+`pod.yaml` is supplied as an example. You can control the port it serves on with the -port flag.
 
 Example from command line (the DNS lookup looks better from a web browser):
 
 ```console
-$ kubectl create -f examples/explorer/pod.json
+$ kubectl create -f examples/explorer/pod.yaml
 $ kubectl proxy &
 Starting to serve on localhost:8001
 

examples/explorer/pod.json

-{
-  "kind": "Pod",
-  "apiVersion": "v1",
-  "metadata": {
-    "name": "explorer"
-  },
-  "spec": {
-    "containers": [
-      {
-        "name": "explorer",
-        "image": "gcr.io/google_containers/explorer:1.0",
-        "args": [
-          "-port=8080"
-        ],
-        "ports": [
-          {
-            "containerPort": 8080,
-            "protocol": "TCP"
-          }
-        ],
-        "volumeMounts": [
-          {
-            "name": "test-volume",
-            "mountPath": "/mount/test-volume"
-          }
-        ]
-      }
-    ],
-    "volumes": [
-      {
-        "name": "test-volume",
-        "emptyDir": {}
-      }
-    ]
-  }
-}

examples/explorer/pod.yaml

+apiVersion: v1
+kind: Pod
+metadata:
+  name: explorer
+spec:
+  containers:
+    - name: explorer
+      image: gcr.io/google_containers/explorer:1.0
+      args: ["-port=8080"]
+      ports:
+        - containerPort: 8080
+          protocol: TCP
+      volumeMounts:
+        - mountPath: "/mount/test-volume"
+          name: test-volume
+  volumes:
+    - name: test-volume
+      emptyDir: {}