diff --git a/docs/api.md b/docs/api.md index 1c85283028..e685006854 100644 --- a/docs/api.md +++ b/docs/api.md @@ -104,6 +104,7 @@ to pick up the `--runtime-config` changes. ## Enabling resources in the groups DaemonSets, Deployments, HorizontalPodAutoscalers, Ingress, Jobs and ReplicaSets are enabled by default. + Other extensions resources can be enabled by setting `--runtime-config` on apiserver. `--runtime-config` accepts comma separated values. For ex: to disable deployments and jobs, set -`--runtime-config=extensions/v1beta1/deployments=false,extensions/v1beta1/jobs=false` +`--runtime-config=extensions/v1beta1/deployments=false,extensions/v1beta1/ingress=false` diff --git a/docs/user-guide/jobs.md b/docs/user-guide/jobs.md index d64ae9d730..18c28afcf3 100644 --- a/docs/user-guide/jobs.md +++ b/docs/user-guide/jobs.md @@ -21,12 +21,6 @@ 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 fb0c467321..31ebbf40b6 100644 --- a/docs/user-guide/kubectl-conventions.md +++ b/docs/user-guide/kubectl-conventions.md @@ -36,9 +36,6 @@ 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`. 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`.