Unverified Commit 74697e1d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #64628 from Random-Liu/automated-cherry-pick-of-#62670-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #62670: Fix kubelet flags. Cherry pick of #62670 on release-1.10. #62670: Fix kubelet flags.
parents 7aa08d5c 16967eb7
...@@ -55,12 +55,6 @@ func (a *args) String() string { ...@@ -55,12 +55,6 @@ func (a *args) String() string {
// Set function of flag.Value // Set function of flag.Value
func (a *args) Set(value string) error { func (a *args) Set(value string) error {
// Someone else is calling flag.Parse after the flags are parsed in the
// test framework. Use this to avoid the flag being parsed twice.
// TODO(random-liu): Figure out who is parsing the flags.
if flag.Parsed() {
return nil
}
// Note that we assume all white space in flag string is separating fields // Note that we assume all white space in flag string is separating fields
na := strings.Fields(value) na := strings.Fields(value)
*a = append(*a, na...) *a = append(*a, na...)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment