Skip to content

Commit

Permalink
Fix incorrect oc run default option
Browse files Browse the repository at this point in the history
oc specific 'RunOptions' supplies incorrect default
generator for non-RestartAlways jobs.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1577770
  • Loading branch information
michaelgugino committed May 14, 2018
1 parent 5cfe890 commit bc99210
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
3 changes: 1 addition & 2 deletions pkg/oc/cli/cmd/wrappers.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/config"
"k8s.io/kubernetes/pkg/kubectl/cmd/resource"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

cmdutil "github.com/openshift/origin/pkg/cmd/util"
"github.com/openshift/origin/pkg/oc/cli/cmd/create"
Expand Down Expand Up @@ -474,7 +473,7 @@ var (

// NewCmdRun is a wrapper for the Kubernetes cli run command
func NewCmdRun(fullName string, f *clientcmd.Factory, in io.Reader, out, errout io.Writer) *cobra.Command {
opts := &kcmd.RunOptions{DefaultRestartAlwaysGenerator: "deploymentconfig/v1", DefaultGenerator: kcmdutil.RunPodV1GeneratorName}
opts := &kcmd.RunOptions{DefaultRestartAlwaysGenerator: "deploymentconfig/v1"}
cmd := kcmd.NewCmdRunWithOptions(f, opts, in, out, errout)
cmd.Long = runLong
cmd.Example = fmt.Sprintf(runExample, fullName)
Expand Down
6 changes: 1 addition & 5 deletions vendor/k8s.io/kubernetes/pkg/kubectl/cmd/run.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit bc99210

Please sign in to comment.