1
0
mirror of https://github.com/rancher/rke.git synced 2025-08-17 22:37:01 +00:00

Merge pull request #33 from moelsayed/cluster_yaml_comments

Minor cluster.yaml updates
This commit is contained in:
Hussein Galal 2017-11-22 03:07:32 +02:00 committed by GitHub
commit f78defa3b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,8 +5,12 @@ auth:
options: options:
foo: bar foo: bar
# supported plugins are:
# flannel
# calico
# canal
network: network:
plugin: plugin: flannel
options: options:
foo: bar foo: bar
@ -30,7 +34,7 @@ services:
image: quay.io/coreos/hyperkube:v1.7.5_coreos.0 image: quay.io/coreos/hyperkube:v1.7.5_coreos.0
service_cluster_ip_range: 10.233.0.0/18 service_cluster_ip_range: 10.233.0.0/18
extra_args: extra_args:
- --v=4 v: 4
kube-controller: kube-controller:
image: quay.io/coreos/hyperkube:v1.7.5_coreos.0 image: quay.io/coreos/hyperkube:v1.7.5_coreos.0
cluster_cidr: 10.233.64.0/18 cluster_cidr: 10.233.64.0/18
@ -45,6 +49,7 @@ services:
kubeproxy: kubeproxy:
image: quay.io/coreos/hyperkube:v1.7.5_coreos.0 image: quay.io/coreos/hyperkube:v1.7.5_coreos.0
# all addon manifests MUST specify a namespace
addons: |- addons: |-
--- ---
apiVersion: v1 apiVersion: v1