-
Notifications
You must be signed in to change notification settings - Fork 39.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #70204 from imjching/70145-fix-glog-flags-apiserver
kube-apiserver: fix missing global flags for --help
- Loading branch information
Showing
7 changed files
with
117 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| Copyright 2018 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package options | ||
|
|
||
| import ( | ||
| "github.com/spf13/pflag" | ||
|
|
||
| "k8s.io/apiserver/pkg/util/globalflag" | ||
|
|
||
| // ensure libs have a chance to globally register their flags | ||
| _ "k8s.io/apiserver/pkg/admission" | ||
| _ "k8s.io/kubernetes/pkg/cloudprovider/providers" | ||
| ) | ||
|
|
||
| // AddCustomGlobalFlags explicitly registers flags that internal packages register | ||
| // against the global flagsets from "flag". We do this in order to prevent | ||
| // unwanted flags from leaking into the kube-apiserver's flagset. | ||
| func AddCustomGlobalFlags(fs *pflag.FlagSet) { | ||
| // Lookup flags in global flag set and re-register the values with our flagset. | ||
|
|
||
| // Adds flags from k8s.io/kubernetes/pkg/cloudprovider/providers. | ||
| globalflag.Register(fs, "cloud-provider-gce-lb-src-cidrs") | ||
|
|
||
| // Adds flags from k8s.io/apiserver/pkg/admission. | ||
| globalflag.Register(fs, "default-not-ready-toleration-seconds") | ||
| globalflag.Register(fs, "default-unreachable-toleration-seconds") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| Copyright 2018 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package options | ||
|
|
||
| import ( | ||
| "flag" | ||
| "reflect" | ||
| "sort" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/spf13/pflag" | ||
|
|
||
| apiserverflag "k8s.io/apiserver/pkg/util/flag" | ||
| "k8s.io/apiserver/pkg/util/globalflag" | ||
| ) | ||
|
|
||
| func TestAddCustomGlobalFlags(t *testing.T) { | ||
| namedFlagSets := &apiserverflag.NamedFlagSets{} | ||
|
|
||
| // Note that we will register all flags (including klog flags) into the same | ||
| // flag set. This allows us to test against all global flags from | ||
| // flags.CommandLine. | ||
| nfs := namedFlagSets.FlagSet("test") | ||
| globalflag.AddGlobalFlags(nfs, "test-cmd") | ||
| AddCustomGlobalFlags(nfs) | ||
|
|
||
| actualFlag := []string{} | ||
| nfs.VisitAll(func(flag *pflag.Flag) { | ||
| actualFlag = append(actualFlag, flag.Name) | ||
| }) | ||
|
|
||
| // Get all flags from flags.CommandLine, except flag `test.*`. | ||
| wantedFlag := []string{"help"} | ||
| pflag.CommandLine.SetNormalizeFunc(apiserverflag.WordSepNormalizeFunc) | ||
| pflag.CommandLine.AddGoFlagSet(flag.CommandLine) | ||
| pflag.VisitAll(func(flag *pflag.Flag) { | ||
| if !strings.Contains(flag.Name, "test.") { | ||
| wantedFlag = append(wantedFlag, flag.Name) | ||
| } | ||
| }) | ||
| sort.Strings(wantedFlag) | ||
|
|
||
| if !reflect.DeepEqual(wantedFlag, actualFlag) { | ||
| t.Errorf("[Default]: expected %+v, got %+v", wantedFlag, actualFlag) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters