Fixed the conflicts

This commit is contained in:
Naveen
2016-08-04 21:28:38 -04:00
committed by GitHub
parent 55c944b83b
commit 601b9276f0
+6 -2
View File
@@ -1,4 +1,8 @@
--- ---
assignees:
- eparis
- pmorie
--- ---
Many applications require configuration via some combination of config files, command line Many applications require configuration via some combination of config files, command line
arguments, and environment variables. These configuration artifacts should be decoupled from image arguments, and environment variables. These configuration artifacts should be decoupled from image
@@ -362,7 +366,7 @@ spec:
containers: containers:
- name: test-container - name: test-container
image: gcr.io/google_containers/busybox 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: volumeMounts:
- name: config-volume - name: config-volume
mountPath: /etc/config mountPath: /etc/config
@@ -390,7 +394,7 @@ spec:
containers: containers:
- name: test-container - name: test-container
image: gcr.io/google_containers/busybox 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: volumeMounts:
- name: config-volume - name: config-volume
mountPath: /etc/config mountPath: /etc/config