Merge release 1.14 into 1.15. (#16439)

1. Confirm the document content is similar as en version.
2. Merge the zh release-1.14 version into 1.15 version
3. add the 1.14 all sample into 1.15 for template work. The build looks fine.

- docs
  - concepts
    - architecture
This commit is contained in:
成臣 Chengchen
2019-09-19 22:07:01 +09:00
committed by Kubernetes Prow Robot
parent 7c47a2e7c4
commit c87a30450a
147 changed files with 3910 additions and 68 deletions
@@ -0,0 +1,13 @@
apiVersion: v1
kind: Pod
metadata:
name: hello-apparmor
annotations:
# Tell Kubernetes to apply the AppArmor profile "k8s-apparmor-example-deny-write".
# Note that this is ignored if the Kubernetes node is not running version 1.4 or greater.
container.apparmor.security.beta.kubernetes.io/hello: localhost/k8s-apparmor-example-deny-write
spec:
containers:
- name: hello
image: busybox
command: [ "sh", "-c", "echo 'Hello AppArmor!' && sleep 1h" ]