diff --git a/go.mod b/go.mod index 917333ac5..fa775d78e 100644 --- a/go.mod +++ b/go.mod @@ -31,12 +31,12 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20210917114730-87c4113e35a1 - k8s.io/apimachinery v0.0.0-20210917114041-87fb71e8a0dc - k8s.io/cli-runtime v0.0.0-20210917130154-3505ace81723 - k8s.io/client-go v0.0.0-20210917115542-0866d9668796 - k8s.io/component-base v0.0.0-20210917120930-d2872948dda4 - k8s.io/component-helpers v0.0.0-20210917121340-877e28014df4 + k8s.io/api v0.0.0-20210924234029-7036ead25397 + k8s.io/apimachinery v0.0.0-20210920194645-86c0c0f8c8e2 + k8s.io/cli-runtime v0.0.0-20210929125347-88458a05069f + k8s.io/client-go v0.0.0-20210929123603-fe0e5b13da25 + k8s.io/component-base v0.0.0-20210921194550-26d1dd95ca3c + k8s.io/component-helpers v0.0.0-20210917121342-2322d85764d9 k8s.io/klog/v2 v2.20.0 k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 k8s.io/metrics v0.0.0-20210917125722-7754d83b5e6b @@ -47,12 +47,12 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210917114730-87c4113e35a1 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210917114041-87fb71e8a0dc - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210917130154-3505ace81723 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210917115542-0866d9668796 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210917113608-df0a6b4dbccd - k8s.io/component-base => k8s.io/component-base v0.0.0-20210917120930-d2872948dda4 - k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210917121340-877e28014df4 + k8s.io/api => k8s.io/api v0.0.0-20210924234029-7036ead25397 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210920194645-86c0c0f8c8e2 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210929125347-88458a05069f + k8s.io/client-go => k8s.io/client-go v0.0.0-20210929123603-fe0e5b13da25 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210921210841-9e6514600625 + k8s.io/component-base => k8s.io/component-base v0.0.0-20210921194550-26d1dd95ca3c + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210917121342-2322d85764d9 k8s.io/metrics => k8s.io/metrics v0.0.0-20210917125722-7754d83b5e6b ) diff --git a/go.sum b/go.sum index a29831e20..5c5b635b4 100644 --- a/go.sum +++ b/go.sum @@ -902,19 +902,19 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20210917114730-87c4113e35a1 h1:c5smJttDF8/Ols66NZM4olxSwIEa3p0fklSgV9WA9K8= -k8s.io/api v0.0.0-20210917114730-87c4113e35a1/go.mod h1:NPiqbLN26Y6vkL9V/SbA6NtBMKgFkdVKnh5Drj9GgMo= -k8s.io/apimachinery v0.0.0-20210917114041-87fb71e8a0dc h1:3YtYaYOdmmzFpv6HYFzod3i7+3NNlPY7zEyjt9TY1Gk= -k8s.io/apimachinery v0.0.0-20210917114041-87fb71e8a0dc/go.mod h1:CimYO7ypGwnQeTeoJQ8Jht0OVH2glTFHGy7xEhLj3sk= -k8s.io/cli-runtime v0.0.0-20210917130154-3505ace81723 h1:nBEmSBYwswpZD39I4p1RaUf8oB89nuxDZA/vxpJbxAQ= -k8s.io/cli-runtime v0.0.0-20210917130154-3505ace81723/go.mod h1:lsxirrh0HrjPLlRVPj9nrcnKsauuDlViZ5YQuuher4Q= -k8s.io/client-go v0.0.0-20210917115542-0866d9668796 h1:eJ0q7wgEStRq0FWtPyZ6MhTwRvqk09iUFE/nGVRUELw= -k8s.io/client-go v0.0.0-20210917115542-0866d9668796/go.mod h1:C/oFYwJVgw2svwiZ0dxrseaiTt+GdFIlCZLTdi6rE40= -k8s.io/code-generator v0.0.0-20210917113608-df0a6b4dbccd/go.mod h1:pxmv1vqS30f8CieYQvITL/Z2lV5G6+/Ze3wRjS3HXFo= -k8s.io/component-base v0.0.0-20210917120930-d2872948dda4 h1:uXKzM+XUbYarEV1uwXFtok/zIkfPZb/WvVVjkVF71Ng= -k8s.io/component-base v0.0.0-20210917120930-d2872948dda4/go.mod h1:PJRv2U82JnU8M8KPL/57e5oWIFgz/cPCYxluer6+jzo= -k8s.io/component-helpers v0.0.0-20210917121340-877e28014df4 h1:M3Ka4XONC9xmr1MczxT0sKkYwK7MPMtHbHhKdfq3370= -k8s.io/component-helpers v0.0.0-20210917121340-877e28014df4/go.mod h1:g2SsyfupWZrFwaTRveFtg9dr339qmpb84TUY4tvSfR0= +k8s.io/api v0.0.0-20210924234029-7036ead25397 h1:JaNZFi1NkZWSkzbQbOhR5JIH9zCUY3ANkqoKIAGLyiI= +k8s.io/api v0.0.0-20210924234029-7036ead25397/go.mod h1:wyj7UIiindRSrWpl4OJqfk8C2m/1vxi8wpf9x8RwQMQ= +k8s.io/apimachinery v0.0.0-20210920194645-86c0c0f8c8e2 h1:MdB81XVh3V0ZnRKsg6KRpVSH90nw2XjN9JcK9NIWY7Q= +k8s.io/apimachinery v0.0.0-20210920194645-86c0c0f8c8e2/go.mod h1:CimYO7ypGwnQeTeoJQ8Jht0OVH2glTFHGy7xEhLj3sk= +k8s.io/cli-runtime v0.0.0-20210929125347-88458a05069f h1:5oXx8JfeOW+eYToq1abC3CCDdI6SLjGhnbECkL7v/5w= +k8s.io/cli-runtime v0.0.0-20210929125347-88458a05069f/go.mod h1:BhUN7XmadUsdwT9b1KVqwZbYSQApWY/1KgzcVMrJkcM= +k8s.io/client-go v0.0.0-20210929123603-fe0e5b13da25 h1:0EJBsN6QQmdaCAfen3m8s5PM93e25zZu19lZ28IzeUw= +k8s.io/client-go v0.0.0-20210929123603-fe0e5b13da25/go.mod h1:Bf/2pe2Aj1YzozuKfgEljjAKoucHb94ww5KjG27yDhY= +k8s.io/code-generator v0.0.0-20210921210841-9e6514600625/go.mod h1:pxmv1vqS30f8CieYQvITL/Z2lV5G6+/Ze3wRjS3HXFo= +k8s.io/component-base v0.0.0-20210921194550-26d1dd95ca3c h1:HHdTnGiJqrMgO+5oKsr6ybxvkz/M1NIgmkaTMWF6Xls= +k8s.io/component-base v0.0.0-20210921194550-26d1dd95ca3c/go.mod h1:8TBirLP9GfpjkVs7ELLWDFxTw5Lap0YN+vktjBANLDA= +k8s.io/component-helpers v0.0.0-20210917121342-2322d85764d9 h1:wTQt4qUObHeeYrOl9zDlWge1s9vDOxHr57IBB67ojMA= +k8s.io/component-helpers v0.0.0-20210917121342-2322d85764d9/go.mod h1:ETY22rH83IDH7YT0PhtQidwoQdkqGd1PfkweaCI8Z0I= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= diff --git a/pkg/cmd/util/helpers.go b/pkg/cmd/util/helpers.go index 1d8623540..7b03deb29 100644 --- a/pkg/cmd/util/helpers.go +++ b/pkg/cmd/util/helpers.go @@ -23,7 +23,6 @@ import ( "io" "net/url" "os" - "strconv" "strings" "time" @@ -547,30 +546,18 @@ const ( func GetDryRunStrategy(cmd *cobra.Command) (DryRunStrategy, error) { var dryRunFlag = GetFlagString(cmd, "dry-run") - b, err := strconv.ParseBool(dryRunFlag) - // The flag is not a boolean - if err != nil { - switch dryRunFlag { - case cmd.Flag("dry-run").NoOptDefVal: - klog.Warning(`--dry-run is deprecated and can be replaced with --dry-run=client.`) - return DryRunClient, nil - case "client": - return DryRunClient, nil - case "server": - return DryRunServer, nil - case "none": - return DryRunNone, nil - default: - return DryRunNone, fmt.Errorf(`Invalid dry-run value (%v). Must be "none", "server", or "client".`, dryRunFlag) - } - } - // The flag was a boolean - if b { - klog.Warningf(`--dry-run=%v is deprecated (boolean value) and can be replaced with --dry-run=%s.`, dryRunFlag, "client") + switch dryRunFlag { + case cmd.Flag("dry-run").NoOptDefVal: + return DryRunNone, errors.New(`--dry-run flag without a value was specified. A value must be set: "none", "server", or "client".`) + case "client": return DryRunClient, nil + case "server": + return DryRunServer, nil + case "none": + return DryRunNone, nil + default: + return DryRunNone, fmt.Errorf(`Invalid dry-run value (%v). Must be "none", "server", or "client".`, dryRunFlag) } - klog.Warningf(`--dry-run=%v is deprecated (boolean value) and can be replaced with --dry-run=%s.`, dryRunFlag, "none") - return DryRunNone, nil } // PrintFlagsWithDryRunStrategy sets a success message at print time for the dry run strategy