From 8237b34e510ffaa2792d08c2d9aa4fae433d39ac Mon Sep 17 00:00:00 2001
From: Maciej Szulik <maszulik@redhat.com>
Date: Mon, 7 Nov 2016 11:00:49 +0100
Subject: [PATCH] Deprecate extensions/v1beta1.Job

---
 docs/user-guide/jobs.md                | 6 ++++++
 docs/user-guide/kubectl-conventions.md | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/user-guide/jobs.md b/docs/user-guide/jobs.md
index 89ce8c708c..0d897cbbc9 100644
--- a/docs/user-guide/jobs.md
+++ b/docs/user-guide/jobs.md
@@ -21,6 +21,12 @@ due to a node hardware failure or a node reboot).
 
 A Job can also be used to run multiple pods in parallel.
 
+### extensions/v1beta1.Job is deprecated
+
+Starting from version 1.5 `extensions/v1beta1.Job` is being deprecated, with a plan to be removed in
+version 1.6 of kubernetes (see this [issue](https://github.com/kubernetes/kubernetes/issues/32763)).
+Please use `batch/v1.Job` instead.
+
 ## Running an example Job
 
 Here is an example Job config.  It computes π to 2000 places and prints it out.
diff --git a/docs/user-guide/kubectl-conventions.md b/docs/user-guide/kubectl-conventions.md
index 291eb712fa..ad2522f663 100644
--- a/docs/user-guide/kubectl-conventions.md
+++ b/docs/user-guide/kubectl-conventions.md
@@ -36,7 +36,9 @@ In order for `kubectl run` to satisfy infrastructure as code:
 * Pod - use `run-pod/v1`.
 * Replication controller - use `run/v1`.
 * Deployment - use `deployment/v1beta1`.
-* Job (using `extension/v1beta1` endpoint) - use `job/v1beta1`.
+* Job (using `extension/v1beta1` endpoint) - use `job/v1beta1`. Starting from
+  version 1.5 of kuberentes this generator is deprecated, with a plan to be
+  removed in 1.6. Please use `job/v1` instead.
 * Job - use `job/v1`.
 * CronJob - use `cronjob/v2alpha1`.