diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 0e4cfea3e..36c78aee7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -592,7 +592,7 @@ }, { "ImportPath": "k8s.io/component-base", - "Rev": "c7033cd69c96" + "Rev": "9348fb67d787" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 399d926ec..d89fdda1a 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( k8s.io/apimachinery v0.0.0-20200422181210-71d337978e2e k8s.io/cli-runtime v0.0.0-20200415183333-5b13bc8b32e2 k8s.io/client-go v0.0.0-20200422061635-d5598eafb022 - k8s.io/component-base v0.0.0-20200421141809-c7033cd69c96 + k8s.io/component-base v0.0.0-20200423021906-9348fb67d787 k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20200403204345-e1beb1bd0f35 k8s.io/metrics v0.0.0-20200410031643-1542edda33c0 @@ -56,6 +56,6 @@ replace ( k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200415183333-5b13bc8b32e2 k8s.io/client-go => k8s.io/client-go v0.0.0-20200422061635-d5598eafb022 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200418020935-461d14f5d1b5 - k8s.io/component-base => k8s.io/component-base v0.0.0-20200421141809-c7033cd69c96 + k8s.io/component-base => k8s.io/component-base v0.0.0-20200423021906-9348fb67d787 k8s.io/metrics => k8s.io/metrics v0.0.0-20200410031643-1542edda33c0 ) diff --git a/go.sum b/go.sum index 3a476e89b..9abb1cb75 100644 --- a/go.sum +++ b/go.sum @@ -330,7 +330,7 @@ k8s.io/apimachinery v0.0.0-20200422181210-71d337978e2e/go.mod h1:imoz42hIYwpLTRW k8s.io/cli-runtime v0.0.0-20200415183333-5b13bc8b32e2/go.mod h1:if8I7E6TpO/p/o/qgW+hlE1SiBfK4wJB59roqSaO1gQ= k8s.io/client-go v0.0.0-20200422061635-d5598eafb022/go.mod h1:lBtOiyMgQ8Ibafj6tWp9/XLB3w0+XAVoKx6SXTAdPJ4= k8s.io/code-generator v0.0.0-20200418020935-461d14f5d1b5/go.mod h1:921XK/cUtrTpn/F0nAhNaFjo8I7Kue1BIEtdxsYFt9I= -k8s.io/component-base v0.0.0-20200421141809-c7033cd69c96/go.mod h1:Oy1vNndAYVfSxhqiwZjXewh3892JpXigIluVU11U1XA= +k8s.io/component-base v0.0.0-20200423021906-9348fb67d787/go.mod h1:HZ3pegcljoPKhQyaHWt9RSDAwJjsWJXD5M5vQhy+iIE= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/pkg/cmd/run/run.go b/pkg/cmd/run/run.go index 82780d36f..1a6713a01 100644 --- a/pkg/cmd/run/run.go +++ b/pkg/cmd/run/run.go @@ -186,7 +186,7 @@ func addRunFlags(cmd *cobra.Command, opt *RunOptions) { cmd.Flags().BoolVarP(&opt.TTY, "tty", "t", opt.TTY, "Allocated a TTY for each container in the pod.") cmd.Flags().BoolVar(&opt.Attach, "attach", opt.Attach, "If true, wait for the Pod to start running, and then attach to the Pod as if 'kubectl attach ...' were called. Default false, unless '-i/--stdin' is set, in which case the default is true. With '--restart=Never' the exit code of the container process is returned.") cmd.Flags().BoolVar(&opt.LeaveStdinOpen, "leave-stdin-open", opt.LeaveStdinOpen, "If the pod is started in interactive mode or with stdin, leave stdin open after the first attach completes. By default, stdin will be closed after the first attach completes.") - cmd.Flags().String("restart", "Always", i18n.T("The restart policy for this Pod. Legal values [Always, OnFailure, Never]. If set to 'Always' a deployment is created, if set to 'OnFailure' a job is created, if set to 'Never', a regular pod is created. For the latter two --replicas must be 1. Default 'Always', for CronJobs `Never`.")) + cmd.Flags().String("restart", "Always", i18n.T("The restart policy for this Pod. Legal values [Always, OnFailure, Never].")) cmd.Flags().Bool("command", false, "If true and extra arguments are present, use them as the 'command' field in the container, rather than the 'args' field which is the default.") cmd.Flags().String("requests", "", i18n.T("The resource requirement requests for this container. For example, 'cpu=100m,memory=256Mi'. Note that server side components may assign requests depending on the server configuration, such as limit ranges.")) cmd.Flags().String("limits", "", i18n.T("The resource requirement limits for this container. For example, 'cpu=200m,memory=512Mi'. Note that server side components may assign limits depending on the server configuration, such as limit ranges."))