Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io: Update links to proper repos # Conflicts: # docs/admin/kubeadm.md # docs/concepts/overview/kubernetes-api.md # docs/reference/api-overview.md # docs/setup/independent/create-cluster-kubeadm.md # docs/tasks/administer-cluster/configure-pod-disruption-budget.md
This commit is contained in:
@@ -46,7 +46,7 @@ You will install these packages on all of your machines:
|
||||
**Note:** If you already have kubeadm installed, you should do a `apt-get update &&
|
||||
apt-get upgrade` or `yum update` to get the latest version of kubeadm. See the
|
||||
kubeadm release notes if you want to read about the different [kubeadm
|
||||
releases](https://github.com/kubernetes/kubeadm/blob/master/CHANGELOG.md)
|
||||
releases](https://git.k8s.io/kubeadm/CHANGELOG.md)
|
||||
|
||||
For each machine:
|
||||
|
||||
|
||||
@@ -88,7 +88,7 @@ have special requirements, or just because you want to understand what is undern
|
||||
cluster, try the [Getting Started from Scratch](/docs/getting-started-guides/scratch) guide.
|
||||
|
||||
If you are interested in supporting Kubernetes on a new platform, see
|
||||
[Writing a Getting Started Guide](https://github.com/kubernetes/community/blob/master/contributors/devel/writing-a-getting-started-guide.md).
|
||||
[Writing a Getting Started Guide](https://git.k8s.io/community/contributors/devel/writing-a-getting-started-guide.md).
|
||||
|
||||
## Universal
|
||||
|
||||
@@ -143,7 +143,7 @@ Below is a table of all of the solutions listed above.
|
||||
|
||||
IaaS Provider | Config. Mgmt. | OS | Networking | Docs | Support Level
|
||||
-------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ----------------------------
|
||||
any | any | multi-support | any CNI | [docs](https://kubernetes.io/docs/getting-started-guides/kubeadm/) | Project ([SIG-cluster-lifecycle](https://github.com/kubernetes/community/tree/master/sig-cluster-lifecycle))
|
||||
any | any | multi-support | any CNI | [docs](https://kubernetes.io/docs/getting-started-guides/kubeadm/) | Project ([SIG-cluster-lifecycle](https://git.k8s.io/community/sig-cluster-lifecycle))
|
||||
GKE | | | GCE | [docs](https://cloud.google.com/container-engine) | Commercial
|
||||
Stackpoint.io | | multi-support | multi-support | [docs](https://stackpoint.io/) | Commercial
|
||||
AppsCode.com | Saltstack | Debian | multi-support | [docs](https://appscode.com/products/cloud-deployment/) | Commercial
|
||||
|
||||
Reference in New Issue
Block a user