github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1372 from nictuku/master

Browse Source 
Minor doc updates
This commit is contained in:
Brendan Burns
2014-09-18 20:46:19 -07:00
parent c90d62d512 aab58c8033
commit 28f44b0bca
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/local/config-default.sh
View File

@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
## Contains configuration values for interacting with the Vagrant cluster
## Contains configuration values for interacting with a Local cluster
# NUMBER OF MINIONS IN THE CLUSTER
NUM_MINIONS=1

2
docs/networking.md
View File

@@ -66,7 +66,7 @@ Docker allocates IP addresses from a bridge we create on each node, using its
### Other networking implementation examples
With the primary aim of providing IP-per-pod-model, other implementations exist to serve the purpose outside of GCE.
- [OpenVSwitch with GRE/VxLAN](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/ovs-networking.md)
- [Rudder](https://github.com/coreos/rudder#rudder)
- [Flannel](https://github.com/coreos/flannel#flannel)
## Challenges and future work