From 030c53f585ba60bf9ecb374ceb87650188e2a8c0 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu-zidif Date: Thu, 27 Apr 2017 09:11:18 +0800 Subject: [PATCH] README.md: Update outdated links --- cluster/juju/layers/kubernetes-master/README.md | 4 ++-- examples/guestbook/README.md | 8 ++++---- examples/mysql-wordpress-pd/README.md | 14 +++++++------- examples/storage/cassandra/README.md | 4 ++-- examples/storage/minio/README.md | 6 +++--- examples/volumes/nfs/README.md | 6 +++--- federation/README.md | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cluster/juju/layers/kubernetes-master/README.md b/cluster/juju/layers/kubernetes-master/README.md index 3ae9ac954d..c1738869a8 100644 --- a/cluster/juju/layers/kubernetes-master/README.md +++ b/cluster/juju/layers/kubernetes-master/README.md @@ -7,7 +7,7 @@ workloads combined with best practices from the community. The Kubernetes project defines some new terms that may be unfamiliar to users or operators. For more information please refer to the concept guide in the -[getting started guide](http://kubernetes.io/docs/user-guide/#concept-guide). +[getting started guide](https://kubernetes.io/docs/home/). This charm is an encapsulation of the Kubernetes master processes and the operations to run on any cloud for the entire lifecycle of the cluster. @@ -43,7 +43,7 @@ operator. # Configuration This charm supports some configuration options to set up a Kubernetes cluster -that works in your environment: +that works in your environment: #### dns_domain diff --git a/examples/guestbook/README.md b/examples/guestbook/README.md index f625b87b19..e8be154da5 100644 --- a/examples/guestbook/README.md +++ b/examples/guestbook/README.md @@ -81,7 +81,7 @@ redis-master 10.0.0.170 6379/TCP 20s redis-slave 10.0.0.201 6379/TCP 20s ``` -Now you can access the guestbook on each node with frontend Service's `:`, e.g. `10.0.0.117:80` in this guide. `` is a cluster-internal IP. If you want to access the guestbook from outside of the cluster, add `type: NodePort` to the frontend Service `spec` field. Then you can access the guestbook with `:NodePort` from outside of the cluster. On cloud providers which support external load balancers, adding `type: LoadBalancer` to the frontend Service `spec` field will provision a load balancer for your Service. There are several ways for you to access the guestbook. You may learn from [Accessing services running on the cluster](http://kubernetes.io/docs/user-guide/accessing-the-cluster/#accessing-services-running-on-the-cluster). +Now you can access the guestbook on each node with frontend Service's `:`, e.g. `10.0.0.117:80` in this guide. `` is a cluster-internal IP. If you want to access the guestbook from outside of the cluster, add `type: NodePort` to the frontend Service `spec` field. Then you can access the guestbook with `:NodePort` from outside of the cluster. On cloud providers which support external load balancers, adding `type: LoadBalancer` to the frontend Service `spec` field will provision a load balancer for your Service. There are several ways for you to access the guestbook. You may learn from [Accessing services running on the cluster](https://kubernetes.io/docs/concepts/cluster-administration/access-cluster/#accessing-services-running-on-the-cluster). Clean up the guestbook: @@ -223,11 +223,11 @@ Kubernetes supports two primary modes of finding a Service — environment varia ##### Environment variables -The services in a Kubernetes cluster are discoverable inside other containers via [environment variables](http://kubernetes.io/docs/user-guide/services/#environment-variables). +The services in a Kubernetes cluster are discoverable inside other containers via [environment variables](https://kubernetes.io/docs/concepts/services-networking/service/#environment-variables). ##### DNS service -An alternative is to use the [cluster's DNS service](http://kubernetes.io/docs/user-guide/services/#dns), if it has been enabled for the cluster. This lets all pods do name resolution of services automatically, based on the Service name. +An alternative is to use the [cluster's DNS service](https://kubernetes.io/docs/concepts/services-networking/service/#dns), if it has been enabled for the cluster. This lets all pods do name resolution of services automatically, based on the Service name. This example has been configured to use the DNS service by default. @@ -652,7 +652,7 @@ Then, see the [troubleshooting documentation](http://kubernetes.io/docs/troubles You'll want to set up your guestbook Service so that it can be accessed from outside of the internal Kubernetes network. Above, we introduced one way to do that, by setting `type: LoadBalancer` to Service `spec`. -More generally, Kubernetes supports two ways of exposing a Service onto an external IP address: `NodePort`s and `LoadBalancer`s , as described [here](http://kubernetes.io/docs/user-guide/services/#publishing-services---service-types). +More generally, Kubernetes supports two ways of exposing a Service onto an external IP address: `NodePort`s and `LoadBalancer`s , as described [here](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services---service-types). If the `LoadBalancer` specification is used, it can take a short period for an external IP to show up in `kubectl get services` output, but you should then see it listed as well, e.g. like this: diff --git a/examples/mysql-wordpress-pd/README.md b/examples/mysql-wordpress-pd/README.md index 75673d3683..a4a8a23536 100644 --- a/examples/mysql-wordpress-pd/README.md +++ b/examples/mysql-wordpress-pd/README.md @@ -10,11 +10,11 @@ WordPress image includes an Apache server). Demonstrated Kubernetes Concepts: -* [Persistent Volumes](http://kubernetes.io/docs/user-guide/persistent-volumes/) to +* [Persistent Volumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) to define persistent disks (disk lifecycle not tied to the Pods). -* [Services](http://kubernetes.io/docs/user-guide/services/) to enable Pods to +* [Services](https://kubernetes.io/docs/concepts/services-networking/service/) to enable Pods to locate one another. -* [External Load Balancers](http://kubernetes.io/docs/user-guide/services/#type-loadbalancer) +* [External Load Balancers](https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer) to expose Services externally. * [Deployments](http://kubernetes.io/docs/user-guide/deployments/) to ensure Pods stay up and running. @@ -68,9 +68,9 @@ this example. at PV Claims and Deployments. Run `kubectl version` to see your cluster version. * [Cluster DNS](https://github.com/kubernetes/dns) will be used for service discovery. -* An [external load balancer](http://kubernetes.io/docs/user-guide/services/#type-loadbalancer) +* An [external load balancer](https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer) will be used to access WordPress. -* [Persistent Volume Claims](http://kubernetes.io/docs/user-guide/persistent-volumes/) +* [Persistent Volume Claims](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims) are used. You must create Persistent Volumes in your cluster to be claimed. This example demonstrates how to create two types of volumes, but any volume is sufficient. @@ -83,11 +83,11 @@ to set up a cluster and the ## Decide where you will store your data MySQL and WordPress will each use a -[Persistent Volume](http://kubernetes.io/docs/user-guide/persistent-volumes/) +[Persistent Volume](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) to store their data. We will use a Persistent Volume Claim to claim an available persistent volume. This example covers HostPath and GCEPersistentDisk volumes. Choose one of the two, or see -[Types of Persistent Volumes](http://kubernetes.io/docs/user-guide/persistent-volumes/#types-of-persistent-volumes) +[Types of Persistent Volumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#types-of-persistent-volumes) for more options. ### Host Path diff --git a/examples/storage/cassandra/README.md b/examples/storage/cassandra/README.md index e39f1d3d88..80b68e8c9d 100644 --- a/examples/storage/cassandra/README.md +++ b/examples/storage/cassandra/README.md @@ -30,7 +30,7 @@ This example also uses some of the core components of Kubernetes: - [_Pods_](../../../docs/user-guide/pods.md) - [ _Services_](../../../docs/user-guide/services.md) - [_Replication Controllers_](../../../docs/user-guide/replication-controller.md) -- [_Stateful Sets_](http://kubernetes.io/docs/user-guide/petset/) +- [_Stateful Sets_](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/) - [_Daemon Sets_](../../../docs/admin/daemons.md) ## Prerequisites @@ -171,7 +171,7 @@ StatefulSets (previously PetSets) are a feature that was upgraded to a Beta=1.4 cluster installed and running, and that you have installed the [`kubectl`](https://kubernetes.io/docs/user-guide/prereqs/) command line tool in your path. Please see the +This example assumes that you have a Kubernetes version >=1.4 cluster installed and running, and that you have installed the [`kubectl`](https://kubernetes.io/docs/tasks/kubectl/install/) command line tool in your path. Please see the [getting started guides](https://kubernetes.io/docs/getting-started-guides/) for installation instructions for your platform. ## Minio Standalone Server Deployment @@ -190,8 +190,8 @@ The following document describes the process to deploy [distributed Minio](https This example uses following core components of Kubernetes: -- [_Pods_](https://kubernetes.io/docs/user-guide/pods/) -- [_Services_](https://kubernetes.io/docs/user-guide/services/) +- [_Pods_](https://kubernetes.io/docs/concepts/workloads/pods/pod/) +- [_Services_](https://kubernetes.io/docs/concepts/services-networking/service/) - [_Statefulsets_](https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/) ### Distributed Quickstart diff --git a/examples/volumes/nfs/README.md b/examples/volumes/nfs/README.md index f45018c576..2c7c72e808 100644 --- a/examples/volumes/nfs/README.md +++ b/examples/volumes/nfs/README.md @@ -4,9 +4,9 @@ This example describes how to create Web frontend server, an auto-provisioned pe Demonstrated Kubernetes Concepts: -* [Persistent Volumes](http://kubernetes.io/docs/user-guide/persistent-volumes/) to +* [Persistent Volumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) to define persistent disks (disk lifecycle not tied to the Pods). -* [Services](http://kubernetes.io/docs/user-guide/services/) to enable Pods to +* [Services](https://kubernetes.io/docs/concepts/services-networking/service/) to enable Pods to locate one another. ![alt text][nfs pv example] @@ -14,7 +14,7 @@ Demonstrated Kubernetes Concepts: As illustrated above, two persistent volumes are used in this example: - Web frontend Pod uses a persistent volume based on NFS server, and -- NFS server uses an auto provisioned [persistent volume](http://kubernetes.io/docs/user-guide/persistent-volumes/) from GCE PD or AWS EBS. +- NFS server uses an auto provisioned [persistent volume](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) from GCE PD or AWS EBS. Note, this example uses an NFS container that doesn't support NFSv4. diff --git a/federation/README.md b/federation/README.md index 982212eb7c..26bcb4b933 100644 --- a/federation/README.md +++ b/federation/README.md @@ -1,7 +1,7 @@ # Cluster Federation Kubernetes Cluster Federation enables users to federate multiple -Kubernetes clusters. Please see the [user guide](http://kubernetes.io/docs/user-guide/federation/federated-services/) +Kubernetes clusters. Please see the [user guide](https://kubernetes.io/docs/concepts/cluster-administration/federation-service-discovery/) and the [admin guide](http://kubernetes.io/docs/admin/federation/) for more details about setting up and using the Cluster Federation.