diff --git "a/docs/18.YAML \346\226\207\344\273\266.md" "b/docs/18.YAML \346\226\207\344\273\266.md" index 796523091b02297b64d4607e9d709456d9186067..142e5bb011ed7cca8d7b526ebffcdac0407afc23 100644 --- "a/docs/18.YAML \346\226\207\344\273\266.md" +++ "b/docs/18.YAML \346\226\207\344\273\266.md" @@ -55,14 +55,14 @@ metadata: 同样的,我们可以将上面的 YAML 文件转换成 JSON 文件: ```json { - "apiVersion": "v1", - "kind": "Pod", - "metadata": { - "name": "kube100-site", - "labels": { - "app": "web" - } + "apiVersion": "v1", + "kind": "Pod", + "metadata": { + "name": "kube100-site", + "labels": { + "app": "web" } + } } ``` @@ -80,7 +80,7 @@ args 你可以有任何数量的项在列表中,每个项的定义以破折号(-)开头的,与父元素直接可以缩进一个空格。对应的 JSON 格式如下: ```json { - "args": [ 'Cat', 'Dog', 'Fish' ] + "args": ["Cat", "Dog", "Fish"] } ``` @@ -108,29 +108,29 @@ spec: 比如这个 YAML 文件,我们定义了一个叫 containers 的 List 对象,每个子项都由 name、image、ports 组成,每个 ports 都有一个 key 为 containerPort 的 Map 组成,同样的,我们可以转成如下 JSON 格式文件: ```json { - "apiVersion": "v1", - "kind": "Pod", - "metadata": { - "name": "kube100-site", - "labels": { - "app": web" - } - }, - "spec": { - "containers": [{ - "name": "front-end", - "image": "nginx", - "ports": [{ - "containerPort": "80" - }] - }, { - "name": "flaskapp-demo", - "image": "jcdemo/flaskapp", - "ports": [{ - "containerPort": "5000" - }] - }] - } + "apiVersion": "v1", + "kind": "Pod", + "metadata": { + "name": "kube100-site", + "labels": { + "app": "web" + } + }, + "spec": { + "containers": [{ + "name": "front-end", + "image": "nginx", + "ports": [{ + "containerPort": 80 + }] + }, { + "name": "flaskapp-demo", + "image": "jcdemo/flaskapp", + "ports": [{ + "containerPort": 5000 + }] + }] + } } ``` diff --git "a/docs/50.Kubernetes\350\260\203\345\272\246\347\255\226\347\225\245.md" "b/docs/50.Kubernetes\350\260\203\345\272\246\347\255\226\347\225\245.md" index fd8d1db542e37f0b4f08d726a385d1782b032fd1..bdeda7b49de1e0e6251f8a5e73d7d9d1cba42979 100644 --- "a/docs/50.Kubernetes\350\260\203\345\272\246\347\255\226\347\225\245.md" +++ "b/docs/50.Kubernetes\350\260\203\345\272\246\347\255\226\347\225\245.md" @@ -93,22 +93,22 @@ finalScoreNode = (weight1 * priorityFunc1) + (weight2 * priorityFunc2) + … + ( 下面是官方的 Policy 文件示例: ```json { - "kind" : "Policy", - "apiVersion" : "v1", - "predicates" : [ - {"name" : "PodFitsHostPorts"}, - {"name" : "PodFitsResources"}, - {"name" : "NoDiskConflict"}, - {"name" : "NoVolumeZoneConflict"}, - {"name" : "MatchNodeSelector"}, - {"name" : "HostName"} - ], - "priorities" : [ - {"name" : "LeastRequestedPriority", "weight" : 1}, - {"name" : "BalancedResourceAllocation", "weight" : 1}, - {"name" : "ServiceSpreadingPriority", "weight" : 1}, - {"name" : "EqualPriority", "weight" : 1} - ] + "kind" : "Policy", + "apiVersion" : "v1", + "predicates" : [ + {"name" : "PodFitsHostPorts"}, + {"name" : "PodFitsResources"}, + {"name" : "NoDiskConflict"}, + {"name" : "NoVolumeZoneConflict"}, + {"name" : "MatchNodeSelector"}, + {"name" : "HostName"} + ], + "priorities" : [ + {"name" : "LeastRequestedPriority", "weight" : 1}, + {"name" : "BalancedResourceAllocation", "weight" : 1}, + {"name" : "ServiceSpreadingPriority", "weight" : 1}, + {"name" : "EqualPriority", "weight" : 1} + ] } ```