From 31fce9bee193d8e86d1d6ebd616fdd972e89827f Mon Sep 17 00:00:00 2001 From: zwwhdls <33822635+zwwhdls@users.noreply.github.com> Date: Thu, 20 Jun 2019 03:02:34 +0800 Subject: [PATCH] Fix kubectl reference table of '--generator' (#14983) * fix `--generator` in `kubectl run` guide * distinguish api group from kubectl command in reference table --- .../en/docs/reference/kubectl/conventions.md | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/content/en/docs/reference/kubectl/conventions.md b/content/en/docs/reference/kubectl/conventions.md index cb084fda8e..558e4aa4e0 100644 --- a/content/en/docs/reference/kubectl/conventions.md +++ b/content/en/docs/reference/kubectl/conventions.md @@ -37,19 +37,15 @@ For `kubectl run` to satisfy infrastructure as code: You can create the following resources using `kubectl run` with the `--generator` flag: -| Resource | kubectl command | -|---------------------------------|---------------------------------------------------| -| Pod | `kubectl run --generator=run-pod/v1` | -| Replication controller | `kubectl run --generator=run/v1` | -| Deployment | `kubectl run --generator=extensions/v1beta1` | -| -for an endpoint (default) | `kubectl run --generator=deployment/v1beta1` | -| Deployment | `kubectl run --generator=apps/v1beta1` | -| -for an endpoint (recommended) | `kubectl run --generator=deployment/apps.v1beta1` | -| Job | `kubectl run --generator=job/v1` | -| CronJob | `kubectl run --generator=batch/v1beta1` | -| -for an endpoint (default) | `kubectl run --generator=cronjob/v1beta1` | -| CronJob | `kubectl run --generator=batch/v2alpha1` | -| -for an endpoint (deprecated) | `kubectl run --generator=cronjob/v2alpha1` | +| Resource | api group | kubectl command | +|---------------------------------|--------------------|---------------------------------------------------| +| Pod | v1 | `kubectl run --generator=run-pod/v1` | +| Replication controller | v1 | `kubectl run --generator=run/v1` | +| Deployment (deprecated) | extensions/v1beta1 | `kubectl run --generator=deployment/v1beta1` | +| Deployment (deprecated) | apps/v1beta1 | `kubectl run --generator=deployment/apps.v1beta1` | +| Job (deprecated) | batch/v1 | `kubectl run --generator=job/v1` | +| CronJob (default) | batch/v1beta1 | `kubectl run --generator=cronjob/v1beta1` | +| CronJob (deprecated) | batch/v2alpha1 | `kubectl run --generator=cronjob/v2alpha1` | If you do not specify a generator flag, other flags prompt you to use a specific generator. The following table lists the flags that force you to use specific generators, depending on the version of the cluster: