From 7b7caf3b77a43ff4cbfae8860d8a6eb5ac58473e Mon Sep 17 00:00:00 2001 From: s-ito-ts <42854771+s-ito-ts@users.noreply.github.com> Date: Thu, 9 May 2019 20:40:48 +0900 Subject: [PATCH] Fix orders of yaml for tasks/administer-cluster/[l-z]*.go (#14245) --- .../en/docs/tasks/administer-cluster/reconfigure-kubelet.md | 6 +++--- content/en/examples/admin/cloud/ccm-example.yaml | 2 +- content/en/examples/admin/namespace-dev.json | 2 +- content/en/examples/admin/namespace-prod.json | 2 +- content/en/examples/admin/resource/quota-objects-pvc-2.yaml | 2 +- content/en/examples/admin/resource/quota-objects-pvc.yaml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/content/en/docs/tasks/administer-cluster/reconfigure-kubelet.md b/content/en/docs/tasks/administer-cluster/reconfigure-kubelet.md index 99fb27f946..7c916b3e67 100644 --- a/content/en/docs/tasks/administer-cluster/reconfigure-kubelet.md +++ b/content/en/docs/tasks/administer-cluster/reconfigure-kubelet.md @@ -149,9 +149,6 @@ This is an example of a valid response: ```none apiVersion: v1 -data: - kubelet: | - {...} kind: ConfigMap metadata: creationTimestamp: 2017-09-14T20:23:33Z @@ -160,6 +157,9 @@ metadata: resourceVersion: "119980" selfLink: /api/v1/namespaces/kube-system/configmaps/my-node-config-gkt4c2m4b2 uid: 946d785e-998a-11e7-a8dd-42010a800006 +data: + kubelet: | + {...} ``` The ConfigMap is created in the `kube-system` namespace because this diff --git a/content/en/examples/admin/cloud/ccm-example.yaml b/content/en/examples/admin/cloud/ccm-example.yaml index 4c98162a70..e49413e4cc 100644 --- a/content/en/examples/admin/cloud/ccm-example.yaml +++ b/content/en/examples/admin/cloud/ccm-example.yaml @@ -10,8 +10,8 @@ metadata: name: cloud-controller-manager namespace: kube-system --- -kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding metadata: name: system:cloud-controller-manager roleRef: diff --git a/content/en/examples/admin/namespace-dev.json b/content/en/examples/admin/namespace-dev.json index b2b43b0b73..cb3ed7cdc1 100644 --- a/content/en/examples/admin/namespace-dev.json +++ b/content/en/examples/admin/namespace-dev.json @@ -1,6 +1,6 @@ { - "kind": "Namespace", "apiVersion": "v1", + "kind": "Namespace", "metadata": { "name": "development", "labels": { diff --git a/content/en/examples/admin/namespace-prod.json b/content/en/examples/admin/namespace-prod.json index d4503f1ac1..878ba7866c 100644 --- a/content/en/examples/admin/namespace-prod.json +++ b/content/en/examples/admin/namespace-prod.json @@ -1,6 +1,6 @@ { - "kind": "Namespace", "apiVersion": "v1", + "kind": "Namespace", "metadata": { "name": "production", "labels": { diff --git a/content/en/examples/admin/resource/quota-objects-pvc-2.yaml b/content/en/examples/admin/resource/quota-objects-pvc-2.yaml index 88c165d144..2539c2d309 100644 --- a/content/en/examples/admin/resource/quota-objects-pvc-2.yaml +++ b/content/en/examples/admin/resource/quota-objects-pvc-2.yaml @@ -1,5 +1,5 @@ -kind: PersistentVolumeClaim apiVersion: v1 +kind: PersistentVolumeClaim metadata: name: pvc-quota-demo-2 spec: diff --git a/content/en/examples/admin/resource/quota-objects-pvc.yaml b/content/en/examples/admin/resource/quota-objects-pvc.yaml index b38256b897..728bb4d708 100644 --- a/content/en/examples/admin/resource/quota-objects-pvc.yaml +++ b/content/en/examples/admin/resource/quota-objects-pvc.yaml @@ -1,5 +1,5 @@ -kind: PersistentVolumeClaim apiVersion: v1 +kind: PersistentVolumeClaim metadata: name: pvc-quota-demo spec: