Merge pull request #3398 from monopole/close3343

Close 3343
This commit is contained in:
Kubernetes Prow Robot
2020-12-27 07:30:27 -08:00
committed by GitHub

View File

@@ -43,7 +43,6 @@ type Options struct {
} }
// MakeDefaultOptions returns a default instance of Options. // MakeDefaultOptions returns a default instance of Options.
// TODO(#3343): UseKyaml: konfig.FlagEnableKyamlDefaultValue
func MakeDefaultOptions() *Options { func MakeDefaultOptions() *Options {
return &Options{ return &Options{
DoLegacyResourceSort: false, DoLegacyResourceSort: false,
@@ -51,7 +50,7 @@ func MakeDefaultOptions() *Options {
LoadRestrictions: types.LoadRestrictionsRootOnly, LoadRestrictions: types.LoadRestrictionsRootOnly,
DoPrune: false, DoPrune: false,
PluginConfig: konfig.DisabledPluginConfig(), PluginConfig: konfig.DisabledPluginConfig(),
UseKyaml: false, UseKyaml: konfig.FlagEnableKyamlDefaultValue,
AllowResourceIdChanges: false, AllowResourceIdChanges: false,
} }
} }