From 33dbd567ee44a39d33abac5455acfb1da64e595f Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 19 Mar 2016 17:17:51 -0700 Subject: [PATCH] examples: Inform k8s of all etcd nodes --- examples/cloud/kubernetes-master.sh | 2 +- examples/cloud/kubernetes-worker.sh | 2 +- examples/k8s-docker.yaml | 9 +++------ examples/k8s-rkt.yaml | 9 +++------ 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/examples/cloud/kubernetes-master.sh b/examples/cloud/kubernetes-master.sh index 8abd50ff..4f9f79b6 100644 --- a/examples/cloud/kubernetes-master.sh +++ b/examples/cloud/kubernetes-master.sh @@ -28,7 +28,7 @@ export K8S_SERVICE_IP={{.k8s_service_ip}} export DNS_SERVICE_IP={{.k8s_dns_service_ip}} # ADVERTISE_IP is the host node's IP. -export ADVERTISE_IP={{.k8s_advertise_ip}} +export ADVERTISE_IP={{.ipv4_address}} # TLS Certificate assets are hosted by the Config Server export CERT_ENDPOINT={{.k8s_cert_endpoint}} diff --git a/examples/cloud/kubernetes-worker.sh b/examples/cloud/kubernetes-worker.sh index 96d6debc..8f3c795e 100644 --- a/examples/cloud/kubernetes-worker.sh +++ b/examples/cloud/kubernetes-worker.sh @@ -17,7 +17,7 @@ export K8S_VER=v1.1.8_coreos.0 export DNS_SERVICE_IP={{.k8s_dns_service_ip}} # ADVERTISE_IP is the host node's IP. -export ADVERTISE_IP={{.k8s_advertise_ip}} +export ADVERTISE_IP={{.ipv4_address}} # TLS Certificate assets are hosted by the Config Server export CERT_ENDPOINT={{.k8s_cert_endpoint}} diff --git a/examples/k8s-docker.yaml b/examples/k8s-docker.yaml index c38778f9..69e2b711 100644 --- a/examples/k8s-docker.yaml +++ b/examples/k8s-docker.yaml @@ -11,12 +11,11 @@ groups: networkd_gateway: 172.17.0.1 networkd_dns: 172.17.0.3 networkd_address: 172.17.0.21/16 - k8s_etcd_endpoints: http://172.17.0.23:2379 + k8s_etcd_endpoints: "http://172.17.0.21:2379,http://172.17.0.22:2379,http://172.17.0.23:2379" k8s_pod_network: 10.2.0.0/16 k8s_service_ip_range: 10.3.0.0/24 k8s_service_ip: 10.3.0.1 k8s_dns_service_ip: 10.3.0.10 - k8s_advertise_ip: 172.17.0.21 k8s_cert_endpoint: http://bootcfg.foo:8080/assets fleet_metadata: "role=etcd,name=node1" etcd_name: node1 @@ -32,10 +31,9 @@ groups: networkd_gateway: 172.17.0.1 networkd_dns: 172.17.0.3 networkd_address: 172.17.0.22/16 - k8s_etcd_endpoints: http://172.17.0.23:2379 + k8s_etcd_endpoints: "http://172.17.0.21:2379,http://172.17.0.22:2379,http://172.17.0.23:2379" k8s_controller_endpoint: https://172.17.0.21 k8s_dns_service_ip: 10.3.0.1 - k8s_advertise_ip: 172.17.0.22 k8s_cert_endpoint: http://bootcfg.foo:8080/assets fleet_metadata: "role=etcd,name=node2" etcd_name: node2 @@ -51,10 +49,9 @@ groups: networkd_gateway: 172.17.0.1 networkd_dns: 172.17.0.3 networkd_address: 172.17.0.23/16 - k8s_etcd_endpoints: http://172.17.0.23:2379 + k8s_etcd_endpoints: "http://172.17.0.21:2379,http://172.17.0.22:2379,http://172.17.0.23:2379" k8s_controller_endpoint: https://172.17.0.21 k8s_dns_service_ip: 10.3.0.1 - k8s_advertise_ip: 172.17.0.23 k8s_cert_endpoint: http://bootcfg.foo:8080/assets fleet_metadata: "role=etcd,name=node3" etcd_name: node3 diff --git a/examples/k8s-rkt.yaml b/examples/k8s-rkt.yaml index 973703b2..5fa3b3b6 100644 --- a/examples/k8s-rkt.yaml +++ b/examples/k8s-rkt.yaml @@ -11,12 +11,11 @@ groups: networkd_gateway: 172.15.0.1 networkd_dns: 172.15.0.3 networkd_address: 172.15.0.21/16 - k8s_etcd_endpoints: http://172.15.0.23:2379 + k8s_etcd_endpoints: "http://172.15.0.21:2379,http://172.15.0.22:2379,http://172.15.0.23:2379" k8s_pod_network: 10.2.0.0/16 k8s_service_ip_range: 10.3.0.0/24 k8s_service_ip: 10.3.0.1 k8s_dns_service_ip: 10.3.0.10 - k8s_advertise_ip: 172.15.0.21 k8s_cert_endpoint: http://bootcfg.foo:8080/assets fleet_metadata: "role=etcd,name=node1" etcd_name: node1 @@ -33,10 +32,9 @@ groups: networkd_gateway: 172.15.0.1 networkd_dns: 172.15.0.3 networkd_address: 172.15.0.22/16 - k8s_etcd_endpoints: http://172.15.0.23:2379 + k8s_etcd_endpoints: "http://172.15.0.21:2379,http://172.15.0.22:2379,http://172.15.0.23:2379" k8s_controller_endpoint: https://172.15.0.21 k8s_dns_service_ip: 10.3.0.1 - k8s_advertise_ip: 172.15.0.22 k8s_cert_endpoint: http://bootcfg.foo:8080/assets fleet_metadata: "role=etcd,name=node2" etcd_name: node2 @@ -53,10 +51,9 @@ groups: networkd_gateway: 172.15.0.1 networkd_dns: 172.15.0.3 networkd_address: 172.15.0.23/16 - k8s_etcd_endpoints: http://172.15.0.23:2379 + k8s_etcd_endpoints: "http://172.15.0.21:2379,http://172.15.0.22:2379,http://172.15.0.23:2379" k8s_controller_endpoint: https://172.15.0.21 k8s_dns_service_ip: 10.3.0.1 - k8s_advertise_ip: 172.15.0.23 k8s_cert_endpoint: http://bootcfg.foo:8080/assets fleet_metadata: "role=etcd,name=node3" etcd_name: node3