linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

install: Don't reuse flag set (#2649) 

The instalOnlyFlagSet incorrectly extends the recordableFlagSet.

I'm not sure if this has any potential for unexpected user interactions,
but it's at least confusing when reading the code.

This change makes the flag sets distinct.
This commit is contained in:
Oliver Gould 2019-04-05 14:29:52 -07:00 committed by GitHub
parent edb225069c
commit 4fd1de4340
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/cmd/install.go
View File

@ -307,7 +307,7 @@ func (options *installOptions) recordableFlagSet(e pflag.ErrorHandling) *pflag.F
// installOnlyFlagSet includes flags that are only accessible at install-time
// and not at upgrade-time.
func (options *installOptions) installOnlyFlagSet(e pflag.ErrorHandling) *pflag.FlagSet {
flags := options.recordableFlagSet(e)
flags := pflag.NewFlagSet("install-only", e)
flags.StringVar(
&options.identityOptions.trustDomain, "identity-trust-domain", options.identityOptions.trustDomain,