diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index aba461da6..1e784e884 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -548,7 +548,7 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "7364b6bdad65" + "Rev": "fb749d2f1064" }, { "ImportPath": "k8s.io/apimachinery", @@ -560,7 +560,7 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "3fe2abece89e" + "Rev": "67a413f31aea" }, { "ImportPath": "k8s.io/code-generator", diff --git a/go.mod b/go.mod index bc1fcd257..ae198cfe3 100644 --- a/go.mod +++ b/go.mod @@ -35,10 +35,10 @@ require ( golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f gopkg.in/yaml.v2 v2.2.2 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20190831074750-7364b6bdad65 + k8s.io/api v0.0.0-20190905160310-fb749d2f1064 k8s.io/apimachinery v0.0.0-20190831074630-461753078381 k8s.io/cli-runtime v0.0.0-20190831080432-9d670f2021f4 - k8s.io/client-go v0.0.0-20190831074946-3fe2abece89e + k8s.io/client-go v0.0.0-20190906195228-67a413f31aea k8s.io/component-base v0.0.0-20190831075413-37a093468564 k8s.io/klog v0.4.0 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf @@ -56,10 +56,10 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - k8s.io/api => k8s.io/api v0.0.0-20190831074750-7364b6bdad65 + k8s.io/api => k8s.io/api v0.0.0-20190905160310-fb749d2f1064 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190831074630-461753078381 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190831080432-9d670f2021f4 - k8s.io/client-go => k8s.io/client-go v0.0.0-20190831074946-3fe2abece89e + k8s.io/client-go => k8s.io/client-go v0.0.0-20190906195228-67a413f31aea k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190831074504-732c9ca86353 k8s.io/component-base => k8s.io/component-base v0.0.0-20190831075413-37a093468564 k8s.io/metrics => k8s.io/metrics v0.0.0-20190831080339-bd7772846802 diff --git a/go.sum b/go.sum index e79378b68..c573f6a33 100644 --- a/go.sum +++ b/go.sum @@ -272,10 +272,10 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20190831074750-7364b6bdad65/go.mod h1:u09ZxrpPFcoUNEQM2GsqT/KpglKAtXdEcK+tSMilQ3Q= +k8s.io/api v0.0.0-20190905160310-fb749d2f1064/go.mod h1:u09ZxrpPFcoUNEQM2GsqT/KpglKAtXdEcK+tSMilQ3Q= k8s.io/apimachinery v0.0.0-20190831074630-461753078381/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= k8s.io/cli-runtime v0.0.0-20190831080432-9d670f2021f4/go.mod h1:TtjkdmxYMLASzYbE8E7AUr/ZrXMcmXLnDLRY4sVWspw= -k8s.io/client-go v0.0.0-20190831074946-3fe2abece89e/go.mod h1:hAiMqq+tCk9hxFvWr2DoRiVyCYEGpni4eOcGCQLOEfM= +k8s.io/client-go v0.0.0-20190906195228-67a413f31aea/go.mod h1:xIjk2+YAazaE3BA0+nCwEMFulHzcgsrvtlVWwDkcMhI= k8s.io/code-generator v0.0.0-20190831074504-732c9ca86353/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= k8s.io/component-base v0.0.0-20190831075413-37a093468564/go.mod h1:pB3zmhcOR5xextKMKdxRr2XUCERS2UNFA/6Tr2WmSJs= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= diff --git a/pkg/cmd/annotate/annotate.go b/pkg/cmd/annotate/annotate.go index d647f3c60..78f83638c 100644 --- a/pkg/cmd/annotate/annotate.go +++ b/pkg/cmd/annotate/annotate.go @@ -140,7 +140,6 @@ func NewCmdAnnotate(parent string, f cmdutil.Factory, ioStreams genericclioption o.RecordFlags.AddFlags(cmd) o.PrintFlags.AddFlags(cmd) - cmdutil.AddIncludeUninitializedFlag(cmd) cmd.Flags().BoolVar(&o.overwrite, "overwrite", o.overwrite, "If true, allow annotations to be overwritten, otherwise reject annotation updates that overwrite existing annotations.") cmd.Flags().BoolVar(&o.local, "local", o.local, "If true, annotation will NOT contact api-server but run locally.") cmd.Flags().StringVarP(&o.selector, "selector", "l", o.selector, "Selector (label query) to filter on, not including uninitialized ones, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2).") diff --git a/pkg/cmd/apply/apply.go b/pkg/cmd/apply/apply.go index 915f055ea..53724a874 100644 --- a/pkg/cmd/apply/apply.go +++ b/pkg/cmd/apply/apply.go @@ -185,7 +185,6 @@ func NewCmdApply(baseName string, f cmdutil.Factory, ioStreams genericclioptions cmd.Flags().BoolVar(&o.OpenAPIPatch, "openapi-patch", o.OpenAPIPatch, "If true, use openapi to calculate diff when the openapi presents and the resource can be found in the openapi spec. Otherwise, fall back to use baked-in types.") cmd.Flags().BoolVar(&o.ServerDryRun, "server-dry-run", o.ServerDryRun, "If true, request will be sent to server with dry-run flag, which means the modifications won't be persisted. This is an alpha feature and flag.") cmd.Flags().Bool("dry-run", false, "If true, only print the object that would be sent, without sending it. Warning: --dry-run cannot accurately output the result of merging the local manifest and the server-side data. Use --server-dry-run to get the merged result instead.") - cmdutil.AddIncludeUninitializedFlag(cmd) cmdutil.AddServerSideApplyFlags(cmd) // apply subcommands diff --git a/pkg/cmd/apply/apply_edit_last_applied.go b/pkg/cmd/apply/apply_edit_last_applied.go index e005b5557..b46dfa2b2 100644 --- a/pkg/cmd/apply/apply_edit_last_applied.go +++ b/pkg/cmd/apply/apply_edit_last_applied.go @@ -83,7 +83,6 @@ func NewCmdApplyEditLastApplied(f cmdutil.Factory, ioStreams genericclioptions.I cmdutil.AddFilenameOptionFlags(cmd, &o.FilenameOptions, usage) cmd.Flags().BoolVar(&o.WindowsLineEndings, "windows-line-endings", o.WindowsLineEndings, "Defaults to the line ending native to your platform.") - cmdutil.AddIncludeUninitializedFlag(cmd) return cmd } diff --git a/pkg/cmd/delete/delete.go b/pkg/cmd/delete/delete.go index 8739a5336..bb443ed9a 100644 --- a/pkg/cmd/delete/delete.go +++ b/pkg/cmd/delete/delete.go @@ -143,7 +143,6 @@ func NewCmdDelete(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra deleteFlags.AddFlags(cmd) - cmdutil.AddIncludeUninitializedFlag(cmd) return cmd } diff --git a/pkg/cmd/describe/describe.go b/pkg/cmd/describe/describe.go index bc5677d5e..5462bd6e1 100644 --- a/pkg/cmd/describe/describe.go +++ b/pkg/cmd/describe/describe.go @@ -116,7 +116,6 @@ func NewCmdDescribe(parent string, f cmdutil.Factory, streams genericclioptions. cmd.Flags().StringVarP(&o.Selector, "selector", "l", o.Selector, "Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)") cmd.Flags().BoolVarP(&o.AllNamespaces, "all-namespaces", "A", o.AllNamespaces, "If present, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.") cmd.Flags().BoolVar(&o.DescriberSettings.ShowEvents, "show-events", o.DescriberSettings.ShowEvents, "If true, display events related to the described object.") - cmdutil.AddIncludeUninitializedFlag(cmd) return cmd } diff --git a/pkg/cmd/edit/edit.go b/pkg/cmd/edit/edit.go index 0afee3f02..4a828dba5 100644 --- a/pkg/cmd/edit/edit.go +++ b/pkg/cmd/edit/edit.go @@ -100,6 +100,5 @@ func NewCmdEdit(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra "Defaults to the line ending native to your platform.") cmdutil.AddApplyAnnotationVarFlags(cmd, &o.ApplyAnnotation) - cmdutil.AddIncludeUninitializedFlag(cmd) return cmd } diff --git a/pkg/cmd/label/label.go b/pkg/cmd/label/label.go index 48a379bf0..22d26cb5f 100644 --- a/pkg/cmd/label/label.go +++ b/pkg/cmd/label/label.go @@ -149,7 +149,6 @@ func NewCmdLabel(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobr usage := "identifying the resource to update the labels" cmdutil.AddFilenameOptionFlags(cmd, &o.FilenameOptions, usage) cmdutil.AddDryRunFlag(cmd) - cmdutil.AddIncludeUninitializedFlag(cmd) return cmd } diff --git a/pkg/cmd/set/set_image.go b/pkg/cmd/set/set_image.go index f69bbf028..22c8d66f1 100644 --- a/pkg/cmd/set/set_image.go +++ b/pkg/cmd/set/set_image.go @@ -124,7 +124,6 @@ func NewCmdImage(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra. cmd.Flags().StringVarP(&o.Selector, "selector", "l", o.Selector, "Selector (label query) to filter on, not including uninitialized ones, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)") cmd.Flags().BoolVar(&o.Local, "local", o.Local, "If true, set image will NOT contact api-server but run locally.") cmdutil.AddDryRunFlag(cmd) - cmdutil.AddIncludeUninitializedFlag(cmd) return cmd } diff --git a/pkg/cmd/set/set_resources.go b/pkg/cmd/set/set_resources.go index 87c5bc9fb..2d26729fa 100644 --- a/pkg/cmd/set/set_resources.go +++ b/pkg/cmd/set/set_resources.go @@ -133,7 +133,6 @@ func NewCmdResources(f cmdutil.Factory, streams genericclioptions.IOStreams) *co cmd.Flags().StringVarP(&o.ContainerSelector, "containers", "c", o.ContainerSelector, "The names of containers in the selected pod templates to change, all containers are selected by default - may use wildcards") cmd.Flags().BoolVar(&o.Local, "local", o.Local, "If true, set resources will NOT contact api-server but run locally.") cmdutil.AddDryRunFlag(cmd) - cmdutil.AddIncludeUninitializedFlag(cmd) cmd.Flags().StringVar(&o.Limits, "limits", o.Limits, "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().StringVar(&o.Requests, "requests", o.Requests, "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.") return cmd diff --git a/pkg/cmd/set/set_serviceaccount.go b/pkg/cmd/set/set_serviceaccount.go index 0c3b6a5e7..f826bf8a2 100644 --- a/pkg/cmd/set/set_serviceaccount.go +++ b/pkg/cmd/set/set_serviceaccount.go @@ -114,7 +114,6 @@ func NewCmdServiceAccount(f cmdutil.Factory, streams genericclioptions.IOStreams cmd.Flags().BoolVar(&o.all, "all", o.all, "Select all resources, including uninitialized ones, in the namespace of the specified resource types") cmd.Flags().BoolVar(&o.local, "local", o.local, "If true, set serviceaccount will NOT contact api-server but run locally.") cmdutil.AddDryRunFlag(cmd) - cmdutil.AddIncludeUninitializedFlag(cmd) return cmd } diff --git a/pkg/cmd/set/set_subject.go b/pkg/cmd/set/set_subject.go index df77254b7..32a99b664 100644 --- a/pkg/cmd/set/set_subject.go +++ b/pkg/cmd/set/set_subject.go @@ -114,7 +114,6 @@ func NewCmdSubject(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobr cmd.Flags().StringArrayVar(&o.Users, "user", o.Users, "Usernames to bind to the role") cmd.Flags().StringArrayVar(&o.Groups, "group", o.Groups, "Groups to bind to the role") cmd.Flags().StringArrayVar(&o.ServiceAccounts, "serviceaccount", o.ServiceAccounts, "Service accounts to bind to the role") - cmdutil.AddIncludeUninitializedFlag(cmd) return cmd } diff --git a/pkg/cmd/util/helpers.go b/pkg/cmd/util/helpers.go index 0659eabf3..95f50f0fd 100644 --- a/pkg/cmd/util/helpers.go +++ b/pkg/cmd/util/helpers.go @@ -414,11 +414,6 @@ func AddServerSideApplyFlags(cmd *cobra.Command) { cmd.Flags().String("field-manager", "kubectl", "Name of the manager used to track field ownership.") } -func AddIncludeUninitializedFlag(cmd *cobra.Command) { - cmd.Flags().Bool("include-uninitialized", false, `If true, the kubectl command applies to uninitialized objects. If explicitly set to false, this flag overrides other flags that make the kubectl commands apply to uninitialized objects, e.g., "--all". Objects with empty metadata.initializers are regarded as initialized.`) - cmd.Flags().MarkDeprecated("include-uninitialized", "The Initializers feature has been removed. This flag is now a no-op, and will be removed in v1.15") -} - func AddPodRunningTimeoutFlag(cmd *cobra.Command, defaultTimeout time.Duration) { cmd.Flags().Duration("pod-running-timeout", defaultTimeout, "The length of time (like 5s, 2m, or 3h, higher than zero) to wait until at least one pod is running") }