github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improved regex for double equals arguments (#4506) 

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/4525/head
Derek Nola 2021-11-16 12:40:40 -08:00 committed by GitHub
parent 6e4cc7c29f
commit 404f6f94ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/configfilearg/defaultparser_test.go
View File

@ -29,7 +29,7 @@ func Test_UnitMustParse(t *testing.T) {
args: []string{"k3s", "server", "--write-kubeconfig-mode 644"},
config: "./testdata/defaultdata.yaml",
want: []string{"k3s", "server", "--token=12345", "--node-label=DEAFBEEF",
"--etcd-s3=true", "--etcd-s3-bucket=my-backup", "--write-kubeconfig-mode 644"},
"--etcd-s3=true", "--etcd-s3-bucket=my-backup", "--kubelet-arg=max-pods=999", "--write-kubeconfig-mode 644"},
},
{
name: "Basic etcd-snapshot",
@ -60,7 +60,7 @@ func Test_UnitMustParse(t *testing.T) {
args: []string{"k3s", "agent"},
config: "./testdata/defaultdata.yaml",
want: []string{"k3s", "agent", "--token=12345", "--node-label=DEAFBEEF",
"--etcd-s3=true", "--etcd-s3-bucket=my-backup", "--notaflag=true"},
"--etcd-s3=true", "--etcd-s3-bucket=my-backup", "--notaflag=true", "--kubelet-arg=max-pods=999"},
},
}
for _, tt := range tests {

2
pkg/configfilearg/parser.go
View File

@ -78,7 +78,7 @@ func (p *Parser) stripInvalidFlags(command string, args []string) ([]string, err
}
}
re, err := regexp.Compile("^-+(.+)=")
re, err := regexp.Compile("^-+([^=]*)=")
if err != nil {
return args, err
}

3
pkg/configfilearg/testdata/defaultdata.yaml vendored
View File

@ -2,4 +2,5 @@ token: 12345
node-label: DEAFBEEF
etcd-s3: true
etcd-s3-bucket: my-backup
notaflag : true
notaflag : true
kubelet-arg: "max-pods=999"