Merge branch 'master' into helm-ha-install

This commit is contained in:
Jason Greathouse
2018-07-20 13:03:49 +10:00
120 changed files with 1742 additions and 1627 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
<blockquote>
<strong>Note:</strong>
<p>As of Rancher v2.0 GA, the Azure Container Service option is still in beta.</p>
<p>As of Rancher v2.0 GA, the Azure Kubernetes Service option is still in beta.</p>
</blockquote>
@@ -41,6 +41,12 @@
<td><ul><li>35.160.43.145/32</li><li>35.167.242.46/32</li><li>52.33.59.17/32</li></td>
<td>git.rancher.io (catalogs)</td>
</tr>
<tr>
<td>TCP</td>
<td>2376</td>
<td><ul><li>Any node IP from a node created using Node Driver</li></td>
<td>Docker daemon TLS port used by Docker Machine</td>
</tr>
<tr>
<td>TCP</td>
<td>6443</td>
@@ -8,6 +8,12 @@
<th align="left">Source</th>
<th align="left">Description</th>
</tr>
<tr>
<td>TCP</td>
<td>2376</td>
<td><ul><li>Rancher nodes</li></td>
<td>Docker daemon TLS port used by Docker Machine<br />(only needed when using Node Driver/Templates)</td>
</tr>
<tr>
<td>TCP</td>
<td>2379</td>
@@ -105,6 +111,12 @@
<td><ul><li>Any that consumes Ingress services</li></ul></td>
<td>Ingress controller (HTTPS)</td>
</tr>
<tr>
<td>TCP</td>
<td>2376</td>
<td><ul><li>Rancher nodes</li></td>
<td>Docker daemon TLS port used by Docker Machine<br />(only needed when using Node Driver/Templates)</td>
</tr>
<tr>
<td>TCP</td>
<td>6443</td>
@@ -214,6 +226,12 @@
<td><ul><li>Any that consumes Ingress services</li></ul></td>
<td>Ingress controller (HTTPS)</td>
</tr>
<tr>
<td>TCP</td>
<td>2376</td>
<td><ul><li>Rancher nodes</li></td>
<td>Docker daemon TLS port used by Docker Machine<br />(only needed when using Node Driver/Templates)</td>
</tr>
<tr>
<td>UDP</td>
<td>8472</td>
@@ -1 +1 @@
<div><p>Use <strong>Cluster Options</strong> to choose the version of Kubernetes installed on each cluster node, along with some other options for you cluster.</p></div>
<div><p>Use <strong>Cluster Options</strong> to choose the version of Kubernetes, what network provider will be used, if you want to enable Pod Security Policies and wether the nodes added to this cluster need to have a supported Docker version installed.
@@ -1,10 +1,10 @@
<p>Add one or more <strong>Node Pools</strong> to your cluster. A <em>node pool</em> is a set of virtual machines configured identically to your Linux host. However, each node in the pool also has additional Kubernetes master and worker components installed.<p>
<p>Add one or more <strong>Node Pools</strong> to your cluster.<br/><br/>A <strong>Node Pool</strong> is a collection of nodes based on a Node Template. A Node Template defines the configuration of a Node, like what Operating System image, number of CPUs and amount of RAM. Each Node Pool can have one or more Nodes Roles associated with it.</p>
<blockquote>
<p><strong>Notes:</strong></p>
<ul>
<li>After you create each node template, you can use it to create additional node pools.</li>
<li>Each Kubernetes role (i.e. <code>etcd</code>, <code>Control</code>, and <code>Worker</code>) must be filled. You can either apply all three roles to one pool or spread them around.</li>
<li>Ideally, you should have at least three <code>etcd</code> nodes so that your cluster can fail over to another if a etcd node goes down.</li>
<li>After you create a Node Template, it will be saved and you will be able to re-use it in additional Node Pools.</li>
<li>Each Node Role (i.e. <code>etcd</code>, <code>Control Plane</code>, and <code>Worker</code>) must be fulfilled. Although it is possible to apply multiple Node Roles to a Node Pool, this is not recommended.</li>
<li>The recommended setup is to have a Node Pool with the <code>etcd</code> Node Role and a count of three, a Node Pool with the <code>Control Plane</code> Node Role and a count of at least two, and a Node Pool with the <code>Worker</code> Node Role and a count of at least two. Regarding the <code>etcd</code> Node Role, refer to the <a href="https://coreos.com/etcd/docs/latest/v2/admin_guide.html#optimal-cluster-size" target="_blank">etcd Admin Guide</a>.</li>
</ul>
</blockquote>
@@ -1,13 +1,18 @@
<p>Complete the <strong>Rancher Template</strong> form to add metadata so that you can find your template in Rancher later.</p>
<p>Complete the <strong>Rancher Template</strong> form to configure the Docker daemon on the instances that will be created.</p>
<ul>
<li>
<p><strong>Labels</strong> apply metadata to your Docker objects.</p>
<p><strong>Labels</strong> can be configured on the Docker daemon.</p>
<p><a href="https://docs.docker.com/config/labels-custom-metadata/">Docker object label documentation</a></p>
</li>
<li>
<!-- TODO: Improve the engine options -->
<p><strong>Engine Options</strong> customize the configuration of the <a href="https://docs.docker.com/engine/docker-overview/#the-docker-daemon">Docker daemon</a>.</p>
<p><strong>Engine Options</strong> customize the configuration of the <a href="https://docs.docker.com/engine/docker-overview/#the-docker-daemon">Docker daemon</a>. Important configuration options might include:
<ul>
<li><strong>Docker Engine Install URL:</strong> Determines what Docker version will be installed on the instance.</li>
<li><strong>Registry mirrors:</strong> Docker Registry mirror to be used by the Docker daemon</li>
</ul>
</p>
<p><a href="https://docs.docker.com/engine/reference/commandline/dockerd/">daemon option reference</a></p>
</li>