From 630cc830140c33315b99bc631739f8db9cd2a3a2 Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 17 Jun 2016 20:03:39 -0400 Subject: [PATCH 1/4] Updated index.md fixed sample which was failing. Updated index.md fixed sample which was failing. --- docs/user-guide/configmap/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/configmap/index.md b/docs/user-guide/configmap/index.md index 17cc9c154b..ccd3b74ebb 100644 --- a/docs/user-guide/configmap/index.md +++ b/docs/user-guide/configmap/index.md @@ -362,7 +362,7 @@ spec: containers: - name: test-container image: gcr.io/google_containers/busybox - command: [ "/bin/sh", "cat", "/etc/config/special.how" ] + command: ["cat", "/etc/config/special.how" ] volumeMounts: - name: config-volume mountPath: /etc/config From 674f52b54149e6066dd603ec2ba6fb179c62ebb5 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 31 Jul 2016 09:07:51 -0400 Subject: [PATCH 2/4] Fixed the command line Fixed the command line which was causing an error. --- docs/user-guide/configmap/index.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/user-guide/configmap/index.md b/docs/user-guide/configmap/index.md index ccd3b74ebb..110dfd7c97 100644 --- a/docs/user-guide/configmap/index.md +++ b/docs/user-guide/configmap/index.md @@ -1,3 +1,4 @@ + --- --- Many applications require configuration via some combination of config files, command line @@ -362,7 +363,7 @@ spec: containers: - name: test-container image: gcr.io/google_containers/busybox - command: ["cat", "/etc/config/special.how" ] + command: ["/bin/sh","-c", "cat", "/etc/config/special.how" ] volumeMounts: - name: config-volume mountPath: /etc/config @@ -390,7 +391,7 @@ spec: containers: - name: test-container image: gcr.io/google_containers/busybox - command: [ "/bin/sh", "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 From 55c944b83b74f8496600da90886089d1ae0e3649 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 31 Jul 2016 09:13:03 -0400 Subject: [PATCH 3/4] Fixed the conflicts --- docs/user-guide/configmap/index.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/user-guide/configmap/index.md b/docs/user-guide/configmap/index.md index 110dfd7c97..59374851ac 100644 --- a/docs/user-guide/configmap/index.md +++ b/docs/user-guide/configmap/index.md @@ -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 From 601b9276f042b9ef74475dfbc1a4a087c515b1bf Mon Sep 17 00:00:00 2001 From: Naveen Date: Thu, 4 Aug 2016 21:28:38 -0400 Subject: [PATCH 4/4] Fixed the conflicts --- docs/user-guide/configmap/index.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/user-guide/configmap/index.md b/docs/user-guide/configmap/index.md index 59374851ac..7b5cd452fc 100644 --- a/docs/user-guide/configmap/index.md +++ b/docs/user-guide/configmap/index.md @@ -1,4 +1,8 @@ --- +assignees: +- eparis +- pmorie + --- Many applications require configuration via some combination of config files, command line arguments, and environment variables. These configuration artifacts should be decoupled from image @@ -362,7 +366,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 @@ -390,7 +394,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