github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Enable batch/v1beta1.CronJobs by default

Browse Source
This commit is contained in:
Maciej Szulik
2017-08-28 14:17:21 +02:00
parent b8fde17fc2
commit 2de214b044
32 changed files with 388 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubectl/cmd/run.go
View File

@@ -24,6 +24,7 @@ import (
"github.com/spf13/cobra"
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/api/errors"
@@ -225,7 +226,11 @@ func RunRun(f cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *c
generatorName := cmdutil.GetFlagString(cmd, "generator")
schedule := cmdutil.GetFlagString(cmd, "schedule")
if len(schedule) != 0 && len(generatorName) == 0 {
generatorName = cmdutil.CronJobV2Alpha1GeneratorName
if contains(resourcesList, batchv1beta1.SchemeGroupVersion.WithResource("cronjobs")) {
generatorName = cmdutil.CronJobV1Beta1GeneratorName
} else {
generatorName = cmdutil.CronJobV2Alpha1GeneratorName
}
}
if len(generatorName) == 0 {
switch restartPolicy {