github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix all the reference about the API packages change

Browse Source
This commit is contained in:
stewart-yu
2019-01-16 11:20:16 +08:00
parent e01ff1641c
commit fc54de589f
28 changed files with 135 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kube-controller-manager/app/options/namespacecontroller.go
View File

@@ -19,12 +19,12 @@ package options
import (
"github.com/spf13/pflag"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
namespaceconfig "k8s.io/kubernetes/pkg/controller/namespace/config"
)
// NamespaceControllerOptions holds the NamespaceController options.
type NamespaceControllerOptions struct {
*kubectrlmgrconfig.NamespaceControllerConfiguration
*namespaceconfig.NamespaceControllerConfiguration
}
// AddFlags adds flags related to NamespaceController for controller manager to the specified FlagSet.
@@ -38,7 +38,7 @@ func (o *NamespaceControllerOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up NamespaceController config with options.
func (o *NamespaceControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.NamespaceControllerConfiguration) error {
func (o *NamespaceControllerOptions) ApplyTo(cfg *namespaceconfig.NamespaceControllerConfiguration) error {
if o == nil {
return nil
}