whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the conflicts

Browse Source
This commit is contained in:
Naveen
2016-07-31 09:13:03 -04:00
committed by GitHub
parent 674f52b541
commit 55c944b83b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/user-guide/configmap/index.md
+2 -3
View File
@@ -1,4 +1,3 @@
--- ---
--- ---
Many applications require configuration via some combination of config files, command line Many applications require configuration via some combination of config files, command line
@@ -363,7 +362,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
@@ -391,7 +390,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