From 5ec511844535bbffa8c7fdea0f1044160f1a6454 Mon Sep 17 00:00:00 2001
From: Joel Smith <joelsmith@users.noreply.github.com>
Date: Fri, 23 Feb 2018 11:06:45 -0700
Subject: [PATCH] Don't encourage people to mount downwardAPI volumes on /etc
 (#7484)

Because API data volumes like downwardAPI are expected to be fully
managed by Kubernetes and are now mounted read-only, this causes
problems with other files in /etc like /etc/resolv.conf that Docker
tries to add to the volume. Our examples should show such volumes
being mounted to a dedicated subdirectory for the volume.
---
 .../dapi-volume-resources.yaml                 | 12 ++++++------
 .../inject-data-application/dapi-volume.yaml   | 10 +++++-----
 .../dapi-volume-resources.yaml                 | 18 +++++++++---------
 .../inject-data-application/dapi-volume.yaml   | 10 +++++-----
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/cn/docs/tasks/inject-data-application/dapi-volume-resources.yaml b/cn/docs/tasks/inject-data-application/dapi-volume-resources.yaml
index 55af44ac1b..07bebfb47b 100644
--- a/cn/docs/tasks/inject-data-application/dapi-volume-resources.yaml
+++ b/cn/docs/tasks/inject-data-application/dapi-volume-resources.yaml
@@ -10,14 +10,14 @@ spec:
       args:
       - while true; do
           echo -en '\n';
-          if [[ -e /etc/cpu_limit ]]; then
-            echo -en '\n'; cat /etc/cpu_limit; fi;
+          if [[ -e /etc/podinfo/cpu_limit ]]; then
+            echo -en '\n'; cat /etc/podinfo/cpu_limit; fi;
           if [[ -e /etc/cpu_request ]]; then
-            echo -en '\n'; cat /etc/cpu_request; fi;
+            echo -en '\n'; cat /etc/podinfo/cpu_request; fi;
           if [[ -e /etc/mem_limit ]]; then
-            echo -en '\n'; cat /etc/mem_limit; fi;
+            echo -en '\n'; cat /etc/podinfo/mem_limit; fi;
           if [[ -e /etc/mem_request ]]; then
-            echo -en '\n'; cat /etc/mem_request; fi;
+            echo -en '\n'; cat /etc/podinfo/mem_request; fi;
           sleep 5;
         done;
       resources:
@@ -29,7 +29,7 @@ spec:
           cpu: "250m"
       volumeMounts:
         - name: podinfo
-          mountPath: /etc
+          mountPath: /etc/podinfo
           readOnly: false
   volumes:
     - name: podinfo
diff --git a/cn/docs/tasks/inject-data-application/dapi-volume.yaml b/cn/docs/tasks/inject-data-application/dapi-volume.yaml
index 864c99d11e..e7515afba5 100644
--- a/cn/docs/tasks/inject-data-application/dapi-volume.yaml
+++ b/cn/docs/tasks/inject-data-application/dapi-volume.yaml
@@ -16,15 +16,15 @@ spec:
       command: ["sh", "-c"]
       args:
       - while true; do
-          if [[ -e /etc/labels ]]; then 
-            echo -en '\n\n'; cat /etc/labels; fi;
-          if [[ -e /etc/annotations ]]; then
-            echo -en '\n\n'; cat /etc/annotations; fi;
+          if [[ -e /etc/podinfo/labels ]]; then
+            echo -en '\n\n'; cat /etc/podinfo/labels; fi;
+          if [[ -e /etc/podinfo/annotations ]]; then
+            echo -en '\n\n'; cat /etc/podinfo/annotations; fi;
           sleep 5;
         done;
       volumeMounts:
         - name: podinfo
-          mountPath: /etc
+          mountPath: /etc/podinfo
           readOnly: false
   volumes:
     - name: podinfo
diff --git a/docs/tasks/inject-data-application/dapi-volume-resources.yaml b/docs/tasks/inject-data-application/dapi-volume-resources.yaml
index 55af44ac1b..e357e5a336 100644
--- a/docs/tasks/inject-data-application/dapi-volume-resources.yaml
+++ b/docs/tasks/inject-data-application/dapi-volume-resources.yaml
@@ -10,14 +10,14 @@ spec:
       args:
       - while true; do
           echo -en '\n';
-          if [[ -e /etc/cpu_limit ]]; then
-            echo -en '\n'; cat /etc/cpu_limit; fi;
-          if [[ -e /etc/cpu_request ]]; then
-            echo -en '\n'; cat /etc/cpu_request; fi;
-          if [[ -e /etc/mem_limit ]]; then
-            echo -en '\n'; cat /etc/mem_limit; fi;
-          if [[ -e /etc/mem_request ]]; then
-            echo -en '\n'; cat /etc/mem_request; fi;
+          if [[ -e /etc/podinfo/cpu_limit ]]; then
+            echo -en '\n'; cat /etc/podinfo/cpu_limit; fi;
+          if [[ -e /etc/podinfo/cpu_request ]]; then
+            echo -en '\n'; cat /etc/podinfo/cpu_request; fi;
+          if [[ -e /etc/podinfo/mem_limit ]]; then
+            echo -en '\n'; cat /etc/podinfo/mem_limit; fi;
+          if [[ -e /etc/podinfo/mem_request ]]; then
+            echo -en '\n'; cat /etc/podinfo/mem_request; fi;
           sleep 5;
         done;
       resources:
@@ -29,7 +29,7 @@ spec:
           cpu: "250m"
       volumeMounts:
         - name: podinfo
-          mountPath: /etc
+          mountPath: /etc/podinfo
           readOnly: false
   volumes:
     - name: podinfo
diff --git a/docs/tasks/inject-data-application/dapi-volume.yaml b/docs/tasks/inject-data-application/dapi-volume.yaml
index 864c99d11e..e7515afba5 100644
--- a/docs/tasks/inject-data-application/dapi-volume.yaml
+++ b/docs/tasks/inject-data-application/dapi-volume.yaml
@@ -16,15 +16,15 @@ spec:
       command: ["sh", "-c"]
       args:
       - while true; do
-          if [[ -e /etc/labels ]]; then 
-            echo -en '\n\n'; cat /etc/labels; fi;
-          if [[ -e /etc/annotations ]]; then
-            echo -en '\n\n'; cat /etc/annotations; fi;
+          if [[ -e /etc/podinfo/labels ]]; then
+            echo -en '\n\n'; cat /etc/podinfo/labels; fi;
+          if [[ -e /etc/podinfo/annotations ]]; then
+            echo -en '\n\n'; cat /etc/podinfo/annotations; fi;
           sleep 5;
         done;
       volumeMounts:
         - name: podinfo
-          mountPath: /etc
+          mountPath: /etc/podinfo
           readOnly: false
   volumes:
     - name: podinfo