merge master to 1.10, with fixes (#7682)

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

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