From 89e9851ac5c159008575ac468409cc0e52ba7f21 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 23 Jul 2015 10:13:57 -0700 Subject: [PATCH] Update examples to not use old DNS names --- contrib/ansible/roles/kubernetes/defaults/main.yml | 2 +- .../java/src/io/k8s/cassandra/KubernetesSeedProvider.java | 2 +- examples/cluster-dns/README.md | 2 +- examples/explorer/README.md | 4 ++-- examples/phabricator/cloudsql-authenticator/run.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/ansible/roles/kubernetes/defaults/main.yml b/contrib/ansible/roles/kubernetes/defaults/main.yml index 77d89be2116..736b4d6c149 100644 --- a/contrib/ansible/roles/kubernetes/defaults/main.yml +++ b/contrib/ansible/roles/kubernetes/defaults/main.yml @@ -28,7 +28,7 @@ kube_cert_group: kube-cert # Internal DNS domain name. # This domain must not be used in your network. Services will be discoverable # under .., e.g. -# myservice.default.cluster.local +# myservice.default.svc.cluster.local dns_domain: "{{ cluster_name }}" # IP address of the DNS server. diff --git a/examples/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java b/examples/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java index 0d1dd924d88..3274da19831 100644 --- a/examples/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java +++ b/examples/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java @@ -100,7 +100,7 @@ public class KubernetesSeedProvider implements SeedProvider { public List getSeeds() { List list = new ArrayList(); - String host = "https://kubernetes.default.cluster.local"; + String host = "https://kubernetes.default.svc.cluster.local"; String serviceName = getEnvOrDefault("CASSANDRA_SERVICE", "cassandra"); String podNamespace = getEnvOrDefault("POD_NAMESPACE", "default"); String path = String.format("/api/v1/namespaces/%s/endpoints/", podNamespace); diff --git a/examples/cluster-dns/README.md b/examples/cluster-dns/README.md index 5f2c754024f..317ffa4dff4 100644 --- a/examples/cluster-dns/README.md +++ b/examples/cluster-dns/README.md @@ -171,7 +171,7 @@ $ kubectl logs dns-frontend #### Note about default namespace -If you prefer not using namespace, then all your services can be addressed using `default` namespace, e.g. `http://dns-backend.default.cluster.local:8000`, or shorthand version `http://dns-backend:8000` +If you prefer not using namespace, then all your services can be addressed using `default` namespace, e.g. `http://dns-backend.default.svc.cluster.local:8000`, or shorthand version `http://dns-backend:8000` ### tl; dr; diff --git a/examples/explorer/README.md b/examples/explorer/README.md index 432cc27f867..0830f7c88e9 100644 --- a/examples/explorer/README.md +++ b/examples/explorer/README.md @@ -139,8 +139,8 @@ Result: ([]string) Error: <*>lookup elasticsearch-logging: no such host LookupSRV("", "", elasticsearch-logging): -cname: elasticsearch-logging.default.cluster.local. -Result: ([]*net.SRV)[<*>{Target:(string)elasticsearch-logging.default.cluster.local. Port:(uint16)9200 Priority:(uint16)10 Weight:(uint16)100}] +cname: elasticsearch-logging.default.svc.cluster.local. +Result: ([]*net.SRV)[<*>{Target:(string)elasticsearch-logging.default.svc.cluster.local. Port:(uint16)9200 Priority:(uint16)10 Weight:(uint16)100}] Error: LookupHost(elasticsearch-logging): diff --git a/examples/phabricator/cloudsql-authenticator/run.sh b/examples/phabricator/cloudsql-authenticator/run.sh index 2d1551dfafd..8b84da8e183 100755 --- a/examples/phabricator/cloudsql-authenticator/run.sh +++ b/examples/phabricator/cloudsql-authenticator/run.sh @@ -18,7 +18,7 @@ # should only send updates if something changes. We should be able to do # this by comparing pod creation time with the last scan time. while true; do - hostport="https://kubernetes.default.cluster.local" + hostport="https://kubernetes.default.svc.cluster.local" token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token) path="api/v1/pods" query="labels=$SELECTOR"