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/nodeipamcontroller.go
View File

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