Skip to content

Commit

Permalink
setup page replaces picking the right solutions page
Browse files Browse the repository at this point in the history
Describe language specific style guide in l10n guide (kubernetes#14437)

removed references to Table of solutions

moved [Nutanix Karbon] under the right column
  • Loading branch information
gochist authored and Rajakavitha1 committed May 21, 2019
1 parent ac74c8d commit 5305013
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 16 deletions.
4 changes: 4 additions & 0 deletions content/en/docs/contribute/localization.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ other = "ICH BIN..."

Localizing site strings lets you customize site-wide text and features: for example, the legal copyright text in the footer on each page.

### Language specific style guide and glossary

Some language teams have their own language-specific style guide and glossary. For example, see the [Korean Localization Guide](/ko/docs/contribute/localization_ko/).

## Branching strategy

Because localization projects are highly collaborative efforts, we encourage teams to work in shared development branches.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ current-context: kubelet-context
* Start the appropriate services on the node (fed-node).
```shell
for SERVICES in kube-proxy kubelet docker; do
for SERVICES in kube-proxy kubelet docker; do
systemctl enable --now $SERVICES
systemctl status $SERVICES
systemctl status $SERVICES
done
```

Expand Down Expand Up @@ -175,6 +175,3 @@ kubectl delete -f ./node.json
IaaS Provider | Config. Mgmt | OS | Networking | Docs | Conforms | Support Level
-------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ----------------------------
Bare-metal | custom | Fedora | _none_ | [docs](/docs/getting-started-guides/fedora/fedora_manual_config) | | Project

For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.

4 changes: 2 additions & 2 deletions content/en/docs/setup/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ card:

This section covers different options to set up and run Kubernetes.

Different Kubernetes solutions meet different requirements: ease of maintenance, security, control, available resources, and expertise required to operate and manage a cluster.
Different Kubernetes solutions meet different requirements: ease of maintenance, security, control, available resources, and expertise required to operate and manage a cluster.

You can deploy a Kubernetes cluster on a local machine, cloud, on-prem datacenter; or choose a managed Kubernetes cluster. You can also create custom solutions across a wide range of cloud providers, or bare metal environments.

Expand Down Expand Up @@ -92,7 +92,7 @@ The following production environment solutions table lists the providers and the
| [Microsoft Azure](https://azure.microsoft.com) | [Azure Kubernetes Service (AKS)](https://azure.microsoft.com/en-us/services/kubernetes-service/) | | | | |
| [Mirantis Cloud Platform](https://www.mirantis.com/software/kubernetes/) | | | ✔ | | |
| [Nirmata](https://www.nirmata.com/) | | ✔ | ✔ | | |
| [Nutanix](https://www.nutanix.com/en) | [Nutanix Karbon](https://www.nutanix.com/products/karbon) | | [Nutanix Karbon](https://www.nutanix.com/products/karbon) | | [Nutanix AHV](https://www.nutanix.com/products/acropolis/virtualization) |
| [Nutanix](https://www.nutanix.com/en) | [Nutanix Karbon](https://www.nutanix.com/products/karbon) | | [Nutanix Karbon](https://www.nutanix.com/products/karbon) | | [Nutanix AHV](https://www.nutanix.com/products/acropolis/virtualization) |
| [OpenShift](https://www.openshift.com) |[OpenShift Dedicated](https://www.openshift.com/products/dedicated/) and [OpenShift Online](https://www.openshift.com/products/online/) | | [OpenShift Container Platform](https://www.openshift.com/products/container-platform/) | | [OpenShift Container Platform](https://www.openshift.com/products/container-platform/) |[OpenShift Container Platform](https://www.openshift.com/products/container-platform/)
| [Oracle Cloud Infrastructure Container Engine for Kubernetes (OKE)](https://docs.cloud.oracle.com/iaas/Content/ContEng/Concepts/contengoverview.htm) | ✔ | ✔ | | | |
| [oVirt](https://www.ovirt.org/) | | | | | ✔ |
Expand Down
4 changes: 1 addition & 3 deletions content/en/docs/setup/on-premises-vm/cloudstack.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sudo apt-add-repository ppa:ansible/ansible
sudo apt-get update
sudo apt-get install ansible
```

On CloudStack server you also have to install libselinux-python :

```shell
Expand Down Expand Up @@ -117,6 +117,4 @@ IaaS Provider | Config. Mgmt | OS | Networking | Docs
-------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ----------------------------
CloudStack | Ansible | CoreOS | flannel | [docs](/docs/setup/on-premises-vm/cloudstack/) | | Community ([@Guiques](https://github.com/ltupin/))

For support level information on all solutions, see the [Table of solutions](/docs/setup/pick-right-solution/#table-of-solutions) chart.

{{% /capture %}}
2 changes: 0 additions & 2 deletions content/en/docs/setup/on-premises-vm/ovirt.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,4 @@ IaaS Provider | Config. Mgmt | OS | Networking | Docs
-------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ----------------------------
oVirt | | | | [docs](/docs/setup/on-premises-vm/ovirt/) | | Community ([@simon3z](https://github.com/simon3z))

For support level information on all solutions, see the [Table of solutions](/docs/setup/pick-right-solution/#table-of-solutions) chart.

{{% /capture %}}
2 changes: 0 additions & 2 deletions content/en/docs/setup/turnkey/aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ AWS | kops | Debian | k8s (VPC) | [docs](https
AWS | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/aws) | | Community
AWS | Juju | Ubuntu | flannel, calico, canal | [docs](/docs/getting-started-guides/ubuntu) | 100% | Commercial, Community

For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.

## Further reading

Please see the [Kubernetes docs](/docs/) for more details on administering
Expand Down
2 changes: 0 additions & 2 deletions content/en/docs/setup/turnkey/gce.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,6 @@ IaaS Provider | Config. Mgmt | OS | Networking | Docs
-------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ----------------------------
GCE | Saltstack | Debian | GCE | [docs](/docs/setup/turnkey/gce/) | | Project

For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.

## Further reading

Please see the [Kubernetes docs](/docs/) for more details on administering
Expand Down

0 comments on commit 5305013

Please sign in to comment.