Fixed the conflicts

2016-07-31 09:13:03 -04:00
parent 674f52b541
commit 55c944b83b
1 changed files with 2 additions and 3 deletions
@@ -1,4 +1,3 @@
-
 ---
 ---
 Many applications require configuration via some combination of config files, command line
@@ -363,7 +362,7 @@ spec:
  containers:
    - name: test-container
      image: gcr.io/google_containers/busybox
-      command: ["/bin/sh","-c", "cat", "/etc/config/special.how" ]
+      command: [ "/bin/sh", "-c" , "cat /etc/config/special.how" ]
      volumeMounts:
      - name: config-volume
        mountPath: /etc/config
@@ -391,7 +390,7 @@ spec:
  containers:
    - name: test-container
      image: gcr.io/google_containers/busybox
-      command: [ "/bin/sh", "-c", "cat", "/etc/config/path/to/special-key" ]
+      command: [ "/bin/sh", "-c" , "cat /etc/config/path/to/special-key" ]
      volumeMounts:
      - name: config-volume
        mountPath: /etc/config