Merge pull request #46320 from mcalmer/warn-kubernetes

add warning about future config option change

salt/modules/kubernetes.py

@@ -31,6 +31,13 @@ In case both are provided the `file` entry is preferred.
     salt '*' kubernetes.nodes api_url=http://k8s-api-server:port api_user=myuser api_password=pass
 
 .. versionadded: 2017.7.0
+
+.. warning::
+
+    Configuration options will change in Flourine. All options above will be replaced by:
+
+    - kubernetes.kubeconfig or kubernetes.kubeconfig-data
+    - kubernetes.context
 '''
 
 # Import Python Futures

salt/states/kubernetes.py

@@ -6,6 +6,10 @@ Manage kubernetes resources as salt states
 NOTE: This module requires the proper pillar values set. See
 salt.modules.kubernetes for more information.
 
+.. warning::
+
+    Configuration options will change in Flourine.
+
 The kubernetes module is used to manage different kubernetes resources.