diff --git a/cmd/cloud-controller-manager/app/BUILD b/cmd/cloud-controller-manager/app/BUILD index 815b2c21e3..4d215ba845 100644 --- a/cmd/cloud-controller-manager/app/BUILD +++ b/cmd/cloud-controller-manager/app/BUILD @@ -12,7 +12,6 @@ go_library( "//cmd/cloud-controller-manager/app/config:go_default_library", "//cmd/cloud-controller-manager/app/options:go_default_library", "//cmd/controller-manager/app:go_default_library", - "//cmd/controller-manager/app/options:go_default_library", "//pkg/controller/cloud:go_default_library", "//pkg/controller/route:go_default_library", "//pkg/controller/service:go_default_library", diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index ce14f2f00a..afdf3e5122 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -40,7 +40,6 @@ import ( cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config" "k8s.io/kubernetes/cmd/cloud-controller-manager/app/options" genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app" - cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options" "k8s.io/kubernetes/pkg/util/configz" utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/version" @@ -87,7 +86,9 @@ the cloud specific control loops shipped with Kubernetes.`, namedFlagSets := s.Flags(KnownControllers(), ControllersDisabledByDefault.List()) verflag.AddFlags(namedFlagSets.FlagSet("global")) globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name()) - cmoptions.AddCustomGlobalFlags(namedFlagSets.FlagSet("generic")) + // hoist this flag from the global flagset to preserve the commandline until + // the gce cloudprovider is removed. + globalflag.Register(namedFlagSets.FlagSet("generic"), "cloud-provider-gce-lb-src-cidrs") for _, f := range namedFlagSets.FlagSets { fs.AddFlagSet(f) } diff --git a/cmd/controller-manager/app/options/BUILD b/cmd/controller-manager/app/options/BUILD index a784cd3a80..012a046b01 100644 --- a/cmd/controller-manager/app/options/BUILD +++ b/cmd/controller-manager/app/options/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", @@ -6,7 +6,6 @@ go_library( "cloudprovider.go", "debugging.go", "generic.go", - "globalflags.go", "kubecloudshared.go", "servicecontroller.go", ], @@ -14,11 +13,9 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/client/leaderelectionconfig:go_default_library", - "//pkg/cloudprovider/providers:go_default_library", "//pkg/controller/apis/config:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", - "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/config:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], @@ -37,14 +34,3 @@ filegroup( tags = ["automanaged"], visibility = ["//visibility:public"], ) - -go_test( - name = "go_default_test", - srcs = ["globalflags_test.go"], - embed = [":go_default_library"], - deps = [ - "//staging/src/k8s.io/component-base/cli/flag:go_default_library", - "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", - "//vendor/github.com/spf13/pflag:go_default_library", - ], -) diff --git a/cmd/controller-manager/app/options/globalflags.go b/cmd/controller-manager/app/options/globalflags.go deleted file mode 100644 index e4eda652eb..0000000000 --- a/cmd/controller-manager/app/options/globalflags.go +++ /dev/null @@ -1,35 +0,0 @@ -/* -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/component-base/cli/globalflag" - - // ensure libs have a chance to globally register their flags - _ "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 *-controller-manager'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") -} diff --git a/cmd/controller-manager/app/options/globalflags_test.go b/cmd/controller-manager/app/options/globalflags_test.go deleted file mode 100644 index 75e8665cd5..0000000000 --- a/cmd/controller-manager/app/options/globalflags_test.go +++ /dev/null @@ -1,60 +0,0 @@ -/* -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" - - cliflag "k8s.io/component-base/cli/flag" - "k8s.io/component-base/cli/globalflag" -) - -func TestAddCustomGlobalFlags(t *testing.T) { - namedFlagSets := &cliflag.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("generic") - 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(cliflag.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("Got different flags than expected: expected %+v, got %+v", wantedFlag, actualFlag) - } -} diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index 749e20dc90..3e7bc62678 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -20,7 +20,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//cmd/controller-manager/app:go_default_library", - "//cmd/controller-manager/app/options:go_default_library", "//cmd/kube-controller-manager/app/config:go_default_library", "//cmd/kube-controller-manager/app/options:go_default_library", "//pkg/apis/apps/install:go_default_library", diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 86a0febe1f..3b3c83e94a 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -52,7 +52,6 @@ import ( "k8s.io/component-base/cli/globalflag" "k8s.io/klog" genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app" - cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options" "k8s.io/kubernetes/cmd/kube-controller-manager/app/config" "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" "k8s.io/kubernetes/pkg/controller" @@ -117,7 +116,10 @@ controller, and serviceaccounts controller.`, namedFlagSets := s.Flags(KnownControllers(), ControllersDisabledByDefault.List()) verflag.AddFlags(namedFlagSets.FlagSet("global")) globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name()) - cmoptions.AddCustomGlobalFlags(namedFlagSets.FlagSet("generic")) + // hoist this flag from the global flagset to preserve the commandline until + // the gce cloudprovider is removed. + globalflag.Register(namedFlagSets.FlagSet("generic"), "cloud-provider-gce-lb-src-cidrs") + namedFlagSets.FlagSet("generic").MarkDeprecated("cloud-provider-gce-lb-src-cidrs", "This flag will be removed once the GCE Cloud Provider is removed from kube-controller-manager") for _, f := range namedFlagSets.FlagSets { fs.AddFlagSet(f) } diff --git a/pkg/cloudprovider/providers/BUILD b/pkg/cloudprovider/providers/BUILD index aeccfa1e5b..27eee08610 100644 --- a/pkg/cloudprovider/providers/BUILD +++ b/pkg/cloudprovider/providers/BUILD @@ -9,6 +9,12 @@ go_library( name = "go_default_library", srcs = ["providers.go"], importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers", + visibility = [ + "//cmd/cloud-controller-manager:__pkg__", + "//cmd/kube-apiserver/app/options:__pkg__", + "//cmd/kube-controller-manager/app:__pkg__", + "//cmd/kubelet/app:__pkg__", + ], deps = [ "//pkg/cloudprovider/providers/aws:go_default_library", "//pkg/cloudprovider/providers/azure:go_default_library", diff --git a/pkg/kubeapiserver/options/BUILD b/pkg/kubeapiserver/options/BUILD index 7360f9c0ef..37b8328b53 100644 --- a/pkg/kubeapiserver/options/BUILD +++ b/pkg/kubeapiserver/options/BUILD @@ -19,7 +19,6 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubeapiserver/options", deps = [ - "//pkg/cloudprovider/providers:go_default_library", "//pkg/features:go_default_library", "//pkg/kubeapiserver/authenticator:go_default_library", "//pkg/kubeapiserver/authorizer:go_default_library", diff --git a/pkg/kubeapiserver/options/plugins.go b/pkg/kubeapiserver/options/plugins.go index 895a7945f2..d62ea7f337 100644 --- a/pkg/kubeapiserver/options/plugins.go +++ b/pkg/kubeapiserver/options/plugins.go @@ -20,9 +20,6 @@ package options // This should probably be part of some configuration fed into the build for a // given binary target. import ( - // Cloud providers - _ "k8s.io/kubernetes/pkg/cloudprovider/providers" - // Admission policies "k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages"