Skip to content

Commit d8f115b

Browse files
committed
update contents
1 parent 2c6a278 commit d8f115b

37 files changed

+64
-105
lines changed

appendix/ecosystem.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@
1616

1717
![](../.gitbook/assets/CloudNativeLandscape_Serverless_latest.png)
1818

19-
图片来源:[https://s.cncf.io](https://s.cncf.io)
20-
19+
图片来源:[https://s.cncf.io](https://landscape.cncf.io/serverless)

appendix/reference.md

-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@
2424
* [Awesome Kubernetes](https://github.com/ramitsurana/awesome-kubernetes)
2525
* [Awesome Docker](https://github.com/veggiemonk/awesome-docker)
2626
* [OperatorHub.io](https://www.operatorhub.io/)
27-

apps/devops/argo.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,4 @@ $ argo -n argo delete hello-world-4dhg8
193193
Workflow 'hello-world-4dhg8' deleted
194194
```
195195

196-
更多工作流 YAML 的格式见[官方文档](https://applatix.com/open-source/argo/docs/argo_v2_yaml.html)[工作流示例](https://github.com/argoproj/argo/tree/master/examples)
197-
196+
更多工作流 YAML 的格式见[官方文档](https://argoproj.github.io/argo-workflows/)

apps/devops/draft.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Draft 主要由三个命令组成
1313
由于 Draft 需要构建镜像并部署应用到 Kubernetes 集群,因而在安装 Draft 之前需要
1414

1515
* 部署一个 Kubernetes 集群,部署方法可以参考 [kubernetes 部署方法](../../setup/index.md)
16-
* 安装并初始化 helm(需要 v2.4.x 版本,并且不要忘记运行 `helm init`),具体步骤可以参考 [helm 使用方法](https://github.com/feiskyer/kubernetes-handbook/tree/549e0e3c9ba0175e64b2d4719b5a46e9016d532b/apps/helm-app.md)
16+
* 安装并初始化 helm(需要 v2.4.x 版本,并且不要忘记运行 `helm init`),具体步骤可以参考 [helm 使用方法](../../apps/index/helm.md)
1717
* 注册 docker registry 账号,比如 [Docker Hub](https://hub.docker.com/)[Quay.io](https://quay.io/)
1818
* 配置 Ingress Controller 并在 DNS 中设置通配符域 `*` 的 A 记录(如 `*.draft.example.com`)到 Ingress IP 地址。最简单的 Ingress Controller 创建方式是使用 helm:
1919

@@ -118,4 +118,3 @@ Watching local files for changes...
118118
$ curl virulent-sheep.app.feisky.xyz
119119
Hello, World!
120120
```
121-

apps/index/linkerd.md

-2
Original file line numberDiff line numberDiff line change
@@ -281,5 +281,3 @@ $ kubectl apply -f <(linkerd-inject -f <your k8s config>.yml -linkerdPort 4140)
281281
* [A SERVICE MESH FOR KUBERNETES](https://buoyant.io/2016/10/04/a-service-mesh-for-kubernetes-part-i-top-line-service-metrics/)
282282
* [Linkerd examples](https://github.com/linkerd/linkerd-examples)
283283
* [Service Mesh Pattern](http://philcalcado.com/2017/08/03/pattern_service_mesh.html)
284-
* [https://conduit.io](https://conduit.io)
285-

apps/index/linkerd2.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ prometheus ClusterIP 10.0.205.82 <none> 9090/TCP 163m
3838
proxy-api ClusterIP 10.0.170.201 <none> 8086/TCP 163m
3939
web ClusterIP 10.0.88.136 <none> 8084/TCP,9994/TCP 163m
4040

41-
$ kubectl -n linkerd get pod
41+
$ kubectl -n linkerd get pod
4242
NAME READY STATUS RESTARTS AGE
4343
controller-67489d768d-75wjz 5/5 Running 0 163m
4444
grafana-5df745d8b8-pv6tf 2/2 Running 0 163m
@@ -95,4 +95,3 @@ end id=0:810 src=10.244.6.239:57202 dst=10.244.1.237:8080 grpc-status=OK duratio
9595
* [A SERVICE MESH FOR KUBERNETES](https://buoyant.io/2016/10/04/a-service-mesh-for-kubernetes-part-i-top-line-service-metrics/)
9696
* [Service Mesh Pattern](http://philcalcado.com/2017/08/03/pattern_service_mesh.html)
9797
* [https://linkerd.io/2/overview/](https://linkerd.io/2/overview/)
98-

apps/index/service-rolling-update.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Deployment 已经内置了 RollingUpdate strategy,因此不用再调用 `kubec
88

99
Rolling Update 适用于 `Deployment``Replication Controller`,官方推荐使用 Deployment 而不再使用 Replication Controller。
1010

11-
使用 ReplicationController 时的滚动升级请参考官网说明:[https://kubernetes.io/docs/tasks/run-application/rolling-update-replication-controller/](https://kubernetes.io/docs/tasks/run-application/rolling-update-replication-controller/)
11+
使用 ReplicationController 时的滚动升级请参考官网说明:[https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#rolling-update-deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#rolling-update-deployment)
1212

1313
## ReplicationController 与 Deployment 的关系
1414

@@ -101,7 +101,7 @@ clean:
101101
rm -f hello${TAG}
102102
```
103103

104-
**编译**
104+
**编译**
105105

106106
```text
107107
make all
@@ -154,7 +154,7 @@ spec:
154154
kubectl create -f rolling-update-test.yaml
155155
```
156156

157-
**修改 traefik ingress 配置**
157+
**修改 traefik ingress 配置**
158158

159159
`ingress.yaml` 文件中增加新 service 的配置。
160160

@@ -182,7 +182,7 @@ kubectl create -f rolling-update-test.yaml
182182
This is version 1.
183183
```
184184

185-
**滚动升级**
185+
**滚动升级**
186186

187187
只需要将 `rolling-update-test.yaml` 文件中的 `image` 改成新版本的镜像名,然后执行:
188188

@@ -237,4 +237,3 @@ replicationcontroller "zeppelin-controller" rolling updated
237237
* [Running a Stateless Application Using a Deployment](https://kubernetes.io/docs/tasks/run-application/run-stateless-application-deployment/)
238238
* [Simple Rolling Update](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/cli/simple-rolling-update.md)
239239
* [使用 kubernetes 的 deployment 进行 RollingUpdate](https://segmentfault.com/a/1190000008232770)
240-

apps/istio/istio-community.md

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,5 @@
88
* [istio-dev@](https://groups.google.com/forum/#!forum/istio-dev)
99
* [istio-announce@](https://groups.google.com/forum/#!forum/istio-announce)
1010
* [Twitter](https://twitter.com/IstioMesh)
11-
* [Rocket.Chat](https://istio.rocket.chat/home)
1211
* [FAQ](https://istio.io/faq/)
1312
* [术语表](https://istio.io/docs/reference/glossary/)
14-

community/contribute.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,5 @@ hack/cherry_pick_pull.sh upstream/release-1.7 51870
6060
* [**Kubernetes Contributor Documentation**](https://www.kubernetes.dev/docs/)
6161
* [Special Interest Groups](https://github.com/kubernetes/community)
6262
* [Feature Tracking and Backlog](https://github.com/kubernetes/features)
63-
* [Community Expectations](https://github.com/kubernetes/community/blob/master/contributors/guide/community-expectations.md)
63+
* [Community Expectations](https://github.com/kubernetes/community/blob/master/contributors/guide/expectations.md)
6464
* [Kubernetes release managers](https://github.com/kubernetes/sig-release/blob/master/release-managers.md)
65-

concepts/components/etcd.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ Etcd v3 对过期机制也做了改进,过期时间设置在 lease 上,然
188188

189189
* [Etcd website](https://coreos.com/etcd/)
190190
* [Etcd github](https://github.com/coreos/etcd/)
191-
* [Projects using etcd](https://github.com/coreos/etcd/blob/master/Documentation/production-users.md)
191+
* [Projects using etcd](https://etcd.io/docs/v3.5/integrations/#projects-using-etcd)
192192
* [http://jolestar.com/etcd-architecture/](http://jolestar.com/etcd-architecture/)
193193
* [etcd 从应用场景到实现原理的全方位解读](http://www.infoq.com/cn/articles/etcd-interpretation-application-scenario-implement-principle)
194-

concepts/components/federation.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,5 @@ $ kubectl delete ns federation-system
299299

300300
## 参考文档
301301

302-
* [Kubernetes federation](https://kubernetes.io/docs/concepts/cluster-administration/federation/)
303-
* [kubefed](https://kubernetes.io/docs/tasks/federation/set-up-cluster-federation-kubefed/)
304-
302+
* [Kubernetes federation](https://kubernetes.io/blog/2018/12/12/kubernetes-federation-evolution/)
303+
* [kubefed](https://github.com/kubernetes-sigs/kubefed)

concepts/components/kubelet.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Kubelet 定期(`housekeeping-interval`)检查系统的资源是否达到了
8888

8989
| Eviction Signal | Condition | Description |
9090
| :--- | :--- | :--- |
91-
| `memory.available` | MemoryPressue | `memory.available` := `node.status.capacity[memory]` - `node.stats.memory.workingSet` (计算方法参考[这里](https://kubernetes.io/docs/tasks/administer-cluster/out-of-resource/memory-available.sh)|
91+
| `memory.available` | MemoryPressue | `memory.available` := `node.status.capacity[memory]` - `node.stats.memory.workingSet` (计算方法参考[这里](https://kubernetes.io/docs/tasks/administer-cluster/memory-available.sh)|
9292
| `nodefs.available` | DiskPressure | `nodefs.available` := `node.stats.fs.available`(Kubelet Volume以及日志等) |
9393
| `nodefs.inodesFree` | DiskPressure | `nodefs.inodesFree` := `node.stats.fs.inodesFree` |
9494
| `imagefs.available` | DiskPressure | `imagefs.available` := `node.stats.runtime.imagefs.available`(镜像以及容器可写层等) |

concepts/objects/deployment.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ Deployment 也需要 [`.spec` section](https://github.com/kubernetes/community/b
719719

720720
`.spec.template`[pod template](https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#pod-template). 它跟 [Pod](https://kubernetes.io/docs/concepts/workloads/pods/pod-overview/) 有一模一样的 schema,除了它是嵌套的并且不需要 `apiVersion``kind` 字段。
721721

722-
另外为了划分 Pod 的范围,Deployment 中的 pod template 必须指定适当的 label(不要跟其他 controller 重复了,参考 [selector](https://github.com/kubernetes/kubernetes.github.io/blob/master/docs/concepts/workloads/controllers/deployment.md#selector))和适当的重启策略。
722+
另外为了划分 Pod 的范围,Deployment 中的 pod template 必须指定适当的 label(不要跟其他 controller 重复了,参考 [selector](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#selector))和适当的重启策略。
723723

724724
[`.spec.template.spec.restartPolicy`](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/) 可以设置为 `Always` , 如果不指定的话这就是默认配置。
725725

@@ -749,7 +749,7 @@ Deployment 也需要 [`.spec` section](https://github.com/kubernetes/community/b
749749

750750
#### Rolling Update Deployment
751751

752-
`.spec.strategy.type==RollingUpdate` 时,Deployment 使用 [rolling update](https://kubernetes.io/docs/tasks/run-application/rolling-update-replication-controller/) 的方式更新 Pod 。你可以指定 `maxUnavailable``maxSurge` 来控制 rolling update 进程。
752+
`.spec.strategy.type==RollingUpdate` 时,Deployment 使用 [rolling update](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#rolling-update-deployment) 的方式更新 Pod 。你可以指定 `maxUnavailable``maxSurge` 来控制 rolling update 进程。
753753

754754
**Max Unavailable**
755755

@@ -797,5 +797,4 @@ Deployment revision history 存储在它控制的 ReplicaSets 中。
797797

798798
### kubectl rolling update
799799

800-
[Kubectl rolling update](https://kubernetes.io/docs/tasks/run-application/rolling-update-replication-controller/) 虽然使用类似的方式更新 Pod 和 ReplicationController。但是我们推荐使用 Deployment,因为它是声明式的,客户端侧,具有附加特性,例如即使滚动升级结束后也可以回滚到任何历史版本。
801-
800+
[Kubectl rolling update](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#rolling-update-deployment) 虽然使用类似的方式更新 Pod 和 ReplicationController。但是我们推荐使用 Deployment,因为它是声明式的,客户端侧,具有附加特性,例如即使滚动升级结束后也可以回滚到任何历史版本。

concepts/objects/ingress.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,5 @@ spec:
273273
* [Kubernetes Ingress Controller](https://github.com/kubernetes/ingress/tree/master)
274274
* [使用 NGINX Plus 负载均衡 Kubernetes 服务](http://dockone.io/article/957)
275275
* [使用 NGINX 和 NGINX Plus 的 Ingress Controller 进行 Kubernetes 的负载均衡](http://www.cnblogs.com/276815076/p/6407101.html)
276-
* [Kubernetes : Ingress Controller with Træfɪk and Let's Encrypt](https://blog.osones.com/en/kubernetes-ingress-controller-with-traefik-and-lets-encrypt.html)
277-
* [Kubernetes : Træfɪk and Let's Encrypt at scale](https://blog.osones.com/en/kubernetes-traefik-and-lets-encrypt-at-scale.html)
278-
* [Kubernetes Ingress Controller-Træfɪk](https://docs.traefik.io/user-guide/kubernetes/)
279-
* [Kubernetes 1.2 and simplifying advanced networking with Ingress](http://blog.kubernetes.io/2016/03/Kubernetes-1.2-and-simplifying-advanced-networking-with-Ingress.html)
276+
* [Kubernetes Ingress Controller-Træfɪk](https://doc.traefik.io/traefik/providers/kubernetes-ingress/)
277+
* [Kubernetes 1.2 and simplifying advanced networking with Ingress](https://kubernetes.io/blog/2016/03/kubernetes-1-2-and-simplifying-advanced-networking-with-ingress/)

concepts/objects/persistent-volume.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ apiVersion: apps/v1
409409
kind: StatefulSet
410410
metadata:
411411
name: web
412-
spec:
412+
spec:
413413
serviceName: "nginx"
414414
replicas: 2
415415
selector:
@@ -484,9 +484,9 @@ logs-web-1 us-central1-a
484484
存储快照是 v1.12 新增的 Alpha 特性,用来支持给存储卷创建快照。支持的插件包括
485485

486486
* [GCE Persistent Disk CSI Driver](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver)
487-
* [OpenSDS CSI Driver](https://github.com/opensds/nbp/tree/master/csi/server)
488-
* [Ceph RBD CSI Driver](https://github.com/ceph/ceph-csi/tree/master/pkg/rbd)
489-
* [Portworx CSI Driver](https://github.com/libopenstorage/openstorage/tree/master/csi)
487+
* [OpenSDS CSI Driver](https://docs.opensds.io/guides/user-guides/csi/ceph-csi/)
488+
* [Ceph RBD CSI Driver](https://github.com/ceph/ceph-csi)
489+
* [Portworx CSI Driver](https://docs.portworx.com/portworx-csi-driver/)
490490

491491
![image-20181014215558480](../../.gitbook/assets/image-20181014215558480.png)
492492

@@ -547,4 +547,3 @@ spec:
547547
* [Dynamic Volume Provisioning](https://kubernetes.io/docs/concepts/storage/dynamic-provisioning/)
548548
* [Kubernetes CSI Documentation](https://kubernetes-csi.github.io/docs/)
549549
* [Volume Snapshots Documentation](https://kubernetes.io/docs/concepts/storage/volume-snapshots/)
550-

concepts/objects/security-context.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Kubernetes 提供了三种配置 Security Context 的方法:
1010

1111
## Container-level Security Context
1212

13-
[Container-level Security Context](https://kubernetes.io/docs/api-reference/v1.15/#securitycontext-v1-core) 仅应用到指定的容器上,并且不会影响 Volume。比如设置容器运行在特权模式:
13+
[Container-level Security Context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) 仅应用到指定的容器上,并且不会影响 Volume。比如设置容器运行在特权模式:
1414

1515
```yaml
1616
apiVersion: v1
@@ -28,7 +28,7 @@ spec:
2828
2929
## Pod-level Security Context
3030
31-
[Pod-level Security Context](https://kubernetes.io/docs/api-reference/v1.15/#podsecuritycontext-v1-core) 应用到 Pod 内所有容器,并且还会影响 Volume(包括 fsGroup 和 selinuxOptions)。
31+
[Pod-level Security Context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) 应用到 Pod 内所有容器,并且还会影响 Volume(包括 fsGroup 和 selinuxOptions)。
3232
3333
```yaml
3434
apiVersion: v1

concepts/objects/service.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ spec:
297297

298298
注意 Ingress 本身并不会自动创建负载均衡器,cluster 中需要运行一个 ingress controller 来根据 Ingress 的定义来管理负载均衡器。目前社区提供了 nginx 和 gce 的参考实现。
299299

300-
Traefik 提供了易用的 Ingress Controller,使用方法见 [https://docs.traefik.io/user-guide/kubernetes/](https://docs.traefik.io/user-guide/kubernetes/)。
300+
Traefik 提供了易用的 Ingress Controller,使用方法见 [https://doc.traefik.io/traefik/providers/kubernetes-ingress/](https://doc.traefik.io/traefik/providers/kubernetes-ingress/)。
301301

302302
更多 Ingress 和 Ingress Controller 的介绍参见 [ingress](ingress.md)。
303303

en/CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# CONTRIBUTING
22

33
1. [Fork on Github](https://github.com/feiskyer/kubernetes-handbook/fork).
4-
2. Clone the forked repo: `git clone https://github.com/<user-name>/kubernetes-handbook -b en`.
4+
2. Clone the forked repo: `git clone https://github.com/<user-name>/kubernetes-handbook`.
55
3. Create a new branch, add some changes and commit: `git checkout -b new-branch`.
66
4. Push the branch to github: `git commit -am "comments"; git push`.
7-
5. File a Pull Request on Github to `en` branch.
7+
5. File a Pull Request on Github.

extension/auth/rbac.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ABAC(Attribute Based Access Control)本来是不错的概念,但是在 Kub
2222

2323
## 基础概念
2424

25-
需要理解 RBAC 一些基础的概念和思路,RBAC 是让用户能够访问 [Kubernetes API 资源](https://kubernetes.io/docs/api-reference/v1.15/) 的授权方式。
25+
需要理解 RBAC 一些基础的概念和思路,RBAC 是让用户能够访问 [Kubernetes API 资源](https://kubernetes.io/docs/reference/) 的授权方式。
2626

2727
![RBAC &#x67B6;&#x6784;&#x56FE; 1](../../.gitbook/assets/rbac1%20%281%29.png)
2828

@@ -230,8 +230,7 @@ kubectl create clusterrolebinding permissive-binding \
230230
## 参考文档
231231

232232
* [RBAC documentation](https://kubernetes.io/docs/admin/authorization/rbac/)
233+
* [Using RBAC Authorization](https://kubernetes.io/docs/reference/access-authn-authz/rbac/)
233234
* [Google Cloud Next talks 1](https://www.youtube.com/watch?v=Cd4JU7qzYbE#t=8m01s%20)
234235
* [Google Cloud Next talks 2](https://www.youtube.com/watch?v=18P7cFc6nTU#t=41m06s%20)
235236
* [在 Kubernetes Pod 中使用 Service Account 访问 API Server](http://tonybai.com/2017/03/03/access-api-server-from-a-pod-through-serviceaccount/)
236-
* 部分翻译自 [RBAC Support in Kubernetes](http://blog.kubernetes.io/2017/04/rbac-support-in-kubernetes.html)(转载自[kubernetes 中文社区](https://www.kubernetes.org.cn/1879.html),译者催总,[Jimmy Song](http://rootsongjc.github.com/about) 做了稍许修改)
237-

extension/cloud-provider.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,4 @@ Kubernetes 的 Cloud Provider 目前正在重构中
6767
* 配置 kube-controller-manager `--cloud-provider=external`
6868
* 启动 `cloud-controller-manager`
6969

70-
具体实现方法可以参考 [rancher-cloud-controller-manager](https://github.com/rancher/rancher-cloud-controller-manager)[cloud-controller-manager](https://github.com/kubernetes/kubernetes/blob/master/cmd/cloud-controller-manager/controller-manager.go)
71-
70+
具体实现方法可以参考 [rancher-cloud-controller-manager](https://github.com/rancher/rancher-cloud-controller-manager)[cloud-controller-manager](https://github.com/kubernetes/cloud-provider)

extension/ingress/README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ helm install stable/nginx-ingress --name nginx-ingress --set rbac.create=true
1616

1717
* [HAProxy Ingress controller](https://github.com/jcmoraisjr/haproxy-ingress)
1818
* [Linkerd](https://linkerd.io/config/0.9.1/linkerd/index.html#ingress-identifier)
19-
* [traefik](https://docs.traefik.io/configuration/backends/kubernetes/)
19+
* [traefik](https://doc.traefik.io/traefik/providers/kubernetes-ingress/)
2020
* [AWS Application Load Balancer Ingress Controller](https://github.com/coreos/alb-ingress-controller)
2121
* [kube-ingress-aws-controller](https://github.com/zalando-incubator/kube-ingress-aws-controller)
2222
* [Voyager: HAProxy Ingress Controller](https://github.com/appscode/voyager)
2323

2424
## Ingress 使用方法
2525

2626
具体 Ingress 的使用方法可以参考 [这里](../../concepts/objects/ingress.md)
27-

extension/network-policy.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
## 支持 Network Policy 的网络插件
1515

1616
* [Calico](https://www.projectcalico.org/)
17+
* [Cilium](https://cilium.io/)
1718
* [Romana](https://github.com/romana/romana)
1819
* [Weave Net](https://www.weave.works/)
19-
* [Trireme](https://github.com/aporeto-inc/trireme-kubernetes)
20-
* [OpenContrail](http://www.opencontrail.org/)
2120

2221
## Network Policy 使用方法
2322

2423
具体 Network Policy 的使用方法可以参考 [这里](../concepts/objects/network-policy.md)
25-

extension/network/README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ kubectl apply -f http://docs.projectcalico.org/v2.1/getting-started/kubernetes/i
129129
130130
## [OVN](ovn-kubernetes.md)
131131
132-
[OVN \(Open Virtual Network\)](http://openvswitch.org/support/dist-docs/ovn-architecture.7.html) 是 OVS 提供的原生虚拟化网络方案,旨在解决传统 SDN 架构(比如 Neutron DVR)的性能问题。
132+
[OVN (Open Virtual Network)](https://www.ovn.org/en/) 是 OVS 提供的原生虚拟化网络方案,旨在解决传统 SDN 架构(比如 Neutron DVR)的性能问题。
133133
134134
OVN 为 Kubernetes 提供了两种网络方案:
135135
@@ -236,4 +236,3 @@ kubectl apply -f https://raw.githubusercontent.com/cloudnativelabs/kube-router/m
236236
kubectl -n kube-system delete ds kube-proxy
237237
docker run --privileged --net=host gcr.io/google_containers/kube-proxy-amd64:v1.7.3 kube-proxy --cleanup-iptables
238238
```
239-

0 commit comments

Comments
 (0)