From 0a56b9db512effcff6e91fe29fd3d1453758965f Mon Sep 17 00:00:00 2001 From: Matt McNaughton Date: Fri, 25 Aug 2017 14:54:16 -0400 Subject: [PATCH] Add description of k8s dns to guestbook (#5201) Going through the guestbook tutorial for the first time, the deployment configuration mentioned that whether my configuration included a DNS service would dictate which env value I used for the `GET_HOSTS_FROM` variable. According to https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/, k8s includes DNS by default starting with v1.3. Add this additional info to help the user better understand when DNS may/may not be enabled. --- .../guestbook/frontend-deployment.yaml | 11 +++++++---- .../guestbook/redis-slave-deployment.yaml | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/tutorials/stateless-application/guestbook/frontend-deployment.yaml b/docs/tutorials/stateless-application/guestbook/frontend-deployment.yaml index 1888836b3c..340cb04d70 100644 --- a/docs/tutorials/stateless-application/guestbook/frontend-deployment.yaml +++ b/docs/tutorials/stateless-application/guestbook/frontend-deployment.yaml @@ -20,10 +20,13 @@ spec: env: - name: GET_HOSTS_FROM value: dns - # If your cluster config does not include a dns service, then to - # instead access environment variables to find service host - # info, comment out the 'value: dns' line above, and uncomment the - # line below: + # Using `GET_HOSTS_FROM=dns` requires your cluster to + # provide a dns service. As of Kubernetes 1.3, DNS is a built-in + # service launched automatically. However, if the cluster you are using + # does not have a built-in DNS service, you can instead + # instead access an environment variable to find the master + # service's host. To do so, comment out the 'value: dns' line above, and + # uncomment the line below: # value: env ports: - containerPort: 80 diff --git a/docs/tutorials/stateless-application/guestbook/redis-slave-deployment.yaml b/docs/tutorials/stateless-application/guestbook/redis-slave-deployment.yaml index 2bea4a5134..3ff33c998e 100644 --- a/docs/tutorials/stateless-application/guestbook/redis-slave-deployment.yaml +++ b/docs/tutorials/stateless-application/guestbook/redis-slave-deployment.yaml @@ -21,9 +21,12 @@ spec: env: - name: GET_HOSTS_FROM value: dns - # If your cluster config does not include a dns service, then to + # Using `GET_HOSTS_FROM=dns` requires your cluster to + # provide a dns service. As of Kubernetes 1.3, DNS is a built-in + # service launched automatically. However, if the cluster you are using + # does not have a built-in DNS service, you can instead # instead access an environment variable to find the master - # service's host, comment out the 'value: dns' line above, and + # service's host. To do so, comment out the 'value: dns' line above, and # uncomment the line below: # value: env ports: