diff --git a/kustomize/internal/commands/edit/add/configmap.go b/kustomize/internal/commands/edit/add/configmap.go index 11feb5c69..25272c141 100644 --- a/kustomize/internal/commands/edit/add/configmap.go +++ b/kustomize/internal/commands/edit/add/configmap.go @@ -81,6 +81,11 @@ func newCmdAddConfigMap( "from-env-file", "", "Specify the path to a file to read lines of key=val pairs to create a configmap (i.e. a Docker .env file).") + cmd.Flags().BoolVar( + &flags.DisableNameSuffixHash, + "disableNameSuffixHash", + false, + "Disable the name suffix for the configmap") return cmd } @@ -126,4 +131,9 @@ func mergeFlagsIntoCmArgs(args *types.ConfigMapArgs, flags flagsAndArgs) { args.EnvSources = append( args.EnvSources, flags.EnvFileSource) } + if flags.DisableNameSuffixHash { + args.Options = &types.GeneratorOptions{ + DisableNameSuffixHash: true, + } + } } diff --git a/kustomize/internal/commands/edit/add/flagsandargs.go b/kustomize/internal/commands/edit/add/flagsandargs.go index d17088ab5..5f24fe6bf 100644 --- a/kustomize/internal/commands/edit/add/flagsandargs.go +++ b/kustomize/internal/commands/edit/add/flagsandargs.go @@ -26,6 +26,8 @@ type flagsAndArgs struct { Type string // Namespace of secret Namespace string + // Disable name suffix + DisableNameSuffixHash bool } // Validate validates required fields are set to support structured generation. diff --git a/kustomize/internal/commands/edit/add/secret.go b/kustomize/internal/commands/edit/add/secret.go index 39d96f41c..4a87080d7 100644 --- a/kustomize/internal/commands/edit/add/secret.go +++ b/kustomize/internal/commands/edit/add/secret.go @@ -91,6 +91,11 @@ func newCmdAddSecret( "namespace", "", "Specify the namespace of the secret") + cmd.Flags().BoolVar( + &flags.DisableNameSuffixHash, + "disableNameSuffixHash", + false, + "Disable the name suffix for the secret") return cmd } @@ -139,4 +144,9 @@ func mergeFlagsIntoGeneratorArgs(args *types.GeneratorArgs, flags flagsAndArgs) args.EnvSources = append( args.EnvSources, flags.EnvFileSource) } + if flags.DisableNameSuffixHash { + args.Options = &types.GeneratorOptions{ + DisableNameSuffixHash: true, + } + } } diff --git a/kustomize/internal/commands/edit/add/secret_test.go b/kustomize/internal/commands/edit/add/secret_test.go index 30fc1dd27..6d89914aa 100644 --- a/kustomize/internal/commands/edit/add/secret_test.go +++ b/kustomize/internal/commands/edit/add/secret_test.go @@ -114,3 +114,14 @@ func TestMergeFlagsIntoSecretArgs_EnvSource(t *testing.T) { t.Fatalf("expected env2") } } + +func TestMergeFlagsIntoSecretArgs_DisableNameSuffixHash(t *testing.T) { + k := &types.Kustomization{} + args := findOrMakeSecretArgs(k, "foo", "bar", "forbidden") + mergeFlagsIntoGeneratorArgs( + &args.GeneratorArgs, + flagsAndArgs{DisableNameSuffixHash: true}) + if k.SecretGenerator[0].Options.DisableNameSuffixHash != true { + t.Fatalf("expected true") + } +}