mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-05-17 18:25:26 +00:00
Delete --enable_kyaml flag.
This commit is contained in:
@@ -32,8 +32,7 @@ const (
|
||||
// FlagEnableKyamlDefaultValue is the default value for the --enable_kyaml
|
||||
// flag. This value is also used in unit tests. See provider.DepProvider.
|
||||
//
|
||||
// TODO(#3304): eliminate branching on this constant.
|
||||
// Details: https://github.com/kubernetes-sigs/kustomize/issues/3304
|
||||
// TODO(#3588): Delete this constant.
|
||||
//
|
||||
// All tests should pass for either true or false values
|
||||
// of this constant, without having to check its value.
|
||||
|
||||
@@ -34,6 +34,7 @@ type Options struct {
|
||||
// Options related to kustomize plugins.
|
||||
PluginConfig *types.PluginConfig
|
||||
|
||||
// TODO(#3588): Delete this field (it's always true).
|
||||
// When true, use kyaml/ packages to manipulate KRM yaml.
|
||||
// When false, use k8sdeps/ instead (uses k8s.io/api* packages).
|
||||
UseKyaml bool
|
||||
|
||||
@@ -113,7 +113,6 @@ func NewCmdBuild(help Help, out io.Writer) *cobra.Command {
|
||||
addFlagEnablePlugins(cmd.Flags())
|
||||
addFlagReorderOutput(cmd.Flags())
|
||||
addFlagEnableManagedbyLabel(cmd.Flags())
|
||||
addFlagEnableKyaml(cmd.Flags())
|
||||
addFlagAllowResourceIdChanges(cmd.Flags())
|
||||
|
||||
return cmd
|
||||
@@ -152,7 +151,7 @@ func (o *Options) makeOptions() *krusty.Options {
|
||||
opts.PluginConfig = c
|
||||
}
|
||||
opts.AddManagedbyLabel = isManagedbyLabelEnabled()
|
||||
opts.UseKyaml = flagEnableKyamlValue
|
||||
opts.UseKyaml = konfig.FlagEnableKyamlDefaultValue
|
||||
opts.AllowResourceIdChanges = flagAllowResourceIdChangesValue
|
||||
return opts
|
||||
}
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
// Copyright 2019 The Kubernetes Authors.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package build
|
||||
|
||||
import (
|
||||
"github.com/spf13/pflag"
|
||||
"sigs.k8s.io/kustomize/api/konfig"
|
||||
)
|
||||
|
||||
var (
|
||||
flagEnableKyamlValue = konfig.FlagEnableKyamlDefaultValue
|
||||
)
|
||||
|
||||
func addFlagEnableKyaml(set *pflag.FlagSet) {
|
||||
set.BoolVar(
|
||||
&flagEnableKyamlValue,
|
||||
"enable_kyaml", // flag name
|
||||
konfig.FlagEnableKyamlDefaultValue, // default value
|
||||
"enable dependence on kyaml instead of k8sdeps.", // help
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user