From 676b6b07bd6afa1ef97d453021893dfb8f124ca8 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Tue, 2 Jul 2019 06:50:19 -0700
Subject: [PATCH] Update documentation for k8s in-cluster config

Update the docs and add a release note to let folks know that
in-cluster config is an option now.

Change-Id: Ifb4a575fb7e9b6a89e14f00a2e1cccee6fdabf72
---
 doc/source/configuration.rst                           | 10 ++++++----
 .../notes/k8s-in-cluster-config-e9a711d20faac949.yaml  |  8 ++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/k8s-in-cluster-config-e9a711d20faac949.yaml

diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 714764ce5..26e3e405c 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -1164,13 +1164,15 @@ Selecting the kubernetes driver adds the following options to the
 
 
    .. attr:: context
-      :required:
 
       Name of the context configured in ``kube/config``.
 
-      Before using the driver, Nodepool services need a
-      ``kube/config`` file manually installed with cluster admin
-      context.
+      Before using the driver, Nodepool either needs a ``kube/config``
+      file installed with a cluster admin context, in which case this
+      setting is required, or if Nodepool is running inside
+      Kubernetes, this setting and the ``kube/config`` file may be
+      omitted and Nodepool will use a service account loaded from the
+      in-cluster configuration path.
 
    .. attr:: launch-retries
       :default: 3
diff --git a/releasenotes/notes/k8s-in-cluster-config-e9a711d20faac949.yaml b/releasenotes/notes/k8s-in-cluster-config-e9a711d20faac949.yaml
new file mode 100644
index 000000000..7de2bbdd9
--- /dev/null
+++ b/releasenotes/notes/k8s-in-cluster-config-e9a711d20faac949.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    The Kubernetes driver now supports optionally loading cluster
+    admin service account information from the standard in-cluster
+    configuration paths if Nodepool itself is running in Kubernetes.
+    If this method is used, installation of a ``kube/config`` file in
+    the Nodepool launcher pod is no longer required.