diff --git a/cluster/addons/dns/README.md b/cluster/addons/dns/README.md index d375a674541..9b552733727 100644 --- a/cluster/addons/dns/README.md +++ b/cluster/addons/dns/README.md @@ -87,7 +87,7 @@ what etcd offers (at least not in the way we use it). For simplicty, we run etcd and SkyDNS together in a pod, and we do not try to link etcd instances across replicas. A helper container called [kube2sky](kube2sky/) also runs in the pod and acts a bridge between Kubernetes and SkyDNS. It finds the -Kubernetes master through the `kubernetes-ro` service (via environment +Kubernetes master through the `kubernetes` service (via environment variables), pulls service info from the master, and writes that to etcd for SkyDNS to find. diff --git a/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/heapster-controller.yaml index f82d7063b68..266eb5d2767 100644 --- a/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/docs/getting-started-guides/coreos/azure/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -20,5 +20,5 @@ spec: name: heapster command: - /heapster - - --source=kubernetes:http://kubernetes-ro?auth= + - --source=kubernetes:http://kubernetes?auth= - --sink=influxdb:http://monitoring-influxdb:8086 diff --git a/docs/getting-started-guides/mesos.md b/docs/getting-started-guides/mesos.md index 7c4067ed1d1..89976871c42 100644 --- a/docs/getting-started-guides/mesos.md +++ b/docs/getting-started-guides/mesos.md @@ -116,7 +116,6 @@ POD IP CONTAINER(S) IMAGE(S) HOST LABELS $ bin/kubectl get services # your service IPs will likely differ NAME LABELS SELECTOR IP PORT kubernetes component=apiserver,provider=kubernetes 10.10.10.2 443 -kubernetes-ro component=apiserver,provider=kubernetes 10.10.10.1 80 ``` Lastly, use the Mesos CLI tool to validate the Kubernetes scheduler framework has been registered and running: ```bash @@ -241,7 +240,6 @@ Next, determine the internal IP address of the front end [service][8]: $ bin/kubectl get services NAME LABELS SELECTOR IP PORT kubernetes component=apiserver,provider=kubernetes 10.10.10.2 443 -kubernetes-ro component=apiserver,provider=kubernetes 10.10.10.1 80 redismaster name=redis-master 10.10.10.49 10000 redisslave name=redisslave name=redisslave 10.10.10.109 10001 frontend name=frontend 10.10.10.149 9998 diff --git a/examples/logging-demo/README.md b/examples/logging-demo/README.md index a655e1db307..c50a77ac3e0 100644 --- a/examples/logging-demo/README.md +++ b/examples/logging-demo/README.md @@ -104,7 +104,6 @@ elasticsearch-logging kubernetes.io/cluster-service=true,name=elasticsearch-l kibana-logging kubernetes.io/cluster-service=true,name=kibana-logging name=kibana-logging 10.0.188.118 5601/TCP kube-dns k8s-app=kube-dns,kubernetes.io/cluster-service=true,name=kube-dns k8s-app=kube-dns 10.0.0.10 53/UDP kubernetes component=apiserver,provider=kubernetes 10.0.0.2 443/TCP -kubernetes-ro component=apiserver,provider=kubernetes 10.0.0.1 80/TCP monitoring-grafana kubernetes.io/cluster-service=true,name=grafana name=influxGrafana 10.0.254.202 80/TCP monitoring-heapster kubernetes.io/cluster-service=true,name=heapster name=heapster 10.0.19.214 80/TCP monitoring-influxdb name=influxGrafana name=influxGrafana 10.0.198.71 80/TCP diff --git a/examples/persistent-volumes/README.md b/examples/persistent-volumes/README.md index 42a1f40c4a7..2c2680c91cf 100644 --- a/examples/persistent-volumes/README.md +++ b/examples/persistent-volumes/README.md @@ -89,7 +89,6 @@ cluster/kubectl.sh get services NAME LABELS SELECTOR IP PORT(S) frontendservice name=frontendhttp 10.0.0.241 3000/TCP kubernetes component=apiserver,provider=kubernetes 10.0.0.2 443/TCP -kubernetes-ro component=apiserver,provider=kubernetes 10.0.0.1 80/TCP ``` diff --git a/examples/spark/README.md b/examples/spark/README.md index 15945d55fc0..0572236ba40 100644 --- a/examples/spark/README.md +++ b/examples/spark/README.md @@ -54,7 +54,6 @@ POD IP CONTAINER(S) IMAGE(S) spark-master 192.168.90.14 spark-master mattf/spark-master 172.18.145.8/172.18.145.8 name=spark-master Running NAME LABELS SELECTOR IP PORT kubernetes component=apiserver,provider=kubernetes 10.254.0.2 443 -kubernetes-ro component=apiserver,provider=kubernetes 10.254.0.1 80 spark-master name=spark-master name=spark-master 10.254.125.166 7077 ``` @@ -135,7 +134,6 @@ spark-worker-controller-5v48c 192.168.90.17 spark-worker mattf/sp spark-worker-controller-ehq23 192.168.35.17 spark-worker mattf/spark-worker 172.18.145.12/172.18.145.12 name=spark-worker,uses=spark-master Running NAME LABELS SELECTOR IP PORT kubernetes component=apiserver,provider=kubernetes 10.254.0.2 443 -kubernetes-ro component=apiserver,provider=kubernetes 10.254.0.1 80 spark-master name=spark-master name=spark-master 10.254.125.166 7077 $ sudo docker run -it mattf/spark-base sh diff --git a/examples/storm/README.md b/examples/storm/README.md index 71902e0e84e..3c93298db5e 100644 --- a/examples/storm/README.md +++ b/examples/storm/README.md @@ -62,7 +62,6 @@ zookeeper 192.168.86.4 zookeeper mattf/zookeeper $ kubectl get services NAME LABELS SELECTOR IP PORT kubernetes component=apiserver,provider=kubernetes 10.254.0.2 443 -kubernetes-ro component=apiserver,provider=kubernetes 10.254.0.1 80 zookeeper name=zookeeper name=zookeeper 10.254.139.141 2181 $ echo ruok | nc 10.254.139.141 2181; echo @@ -97,7 +96,6 @@ Ensure that the Nimbus service is running and functional. $ kubectl get services NAME LABELS SELECTOR IP PORT kubernetes component=apiserver,provider=kubernetes 10.254.0.2 443 -kubernetes-ro component=apiserver,provider=kubernetes 10.254.0.1 80 zookeeper name=zookeeper name=zookeeper 10.254.139.141 2181 nimbus name=nimbus name=nimbus 10.254.115.208 6627