whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into release-1.5

Browse Source
This commit is contained in:
Devin Donnelly
2016-11-29 17:08:38 -08:00
parent c180ba163b 3392a989d7
commit 9b2500fb60
100 changed files with 2353 additions and 2091 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/user-guide/kubectl-conventions.md
+2 -2
View File
@@ -40,7 +40,7 @@ In order for `kubectl run` to satisfy infrastructure as code:
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`.
* ScheduledJob - use `scheduledjob/v2alpha1`.
* CronJob - use `cronjob/v2alpha1`.
Additionally, if you didn't specify a generator flag, other flags will suggest using
a specific generator. Below table shows which flags force using specific generators,
@@ -52,7 +52,7 @@ depending on your cluster version:
| Replication Controller | `--generator=run/v1` | `--generator=run/v1` | `--generator=run/v1` | `--restart=Always` |
| Deployment | `--restart=Always` | `--restart=Always` | `--restart=Always` | N/A |
| Job | `--restart=OnFailure` | `--restart=OnFailure` | `--restart=OnFailure` OR `--restart=Never` | N/A |
| Scheduled Job | `--schedule=<cron>` | N/A | N/A | N/A |
| Cron Job | `--schedule=<cron>` | N/A | N/A | N/A |
Note that these flags will use a default generator only when you have not specified
any flag. This also means that combining `--generator` with other flags won't