mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Update extension mechanism and related sample.
This commit is contained in:
parent
781d7cf134
commit
69fee369c9
@ -41,10 +41,15 @@ import (
|
|||||||
_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins
|
_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins
|
||||||
_ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration
|
_ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration
|
||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
|
nodeipamcontrolleroptions "k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
|
||||||
|
nodeipamconfig "k8s.io/kubernetes/pkg/controller/nodeipam/config"
|
||||||
// For existing cloud providers, the option to import legacy providers is still available.
|
// For existing cloud providers, the option to import legacy providers is still available.
|
||||||
// e.g. _"k8s.io/legacy-cloud-providers/<provider>"
|
// e.g. _"k8s.io/legacy-cloud-providers/<provider>"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var nodeIPAMControllerConfiguration nodeipamconfig.NodeIPAMControllerConfiguration
|
||||||
|
var nodeIPAMControllerOptions nodeipamcontrolleroptions.NodeIPAMControllerOptions
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
rand.Seed(time.Now().UnixNano())
|
rand.Seed(time.Now().UnixNano())
|
||||||
|
|
||||||
@ -59,11 +64,14 @@ func main() {
|
|||||||
//delete(controllerInitializers, "cloud-node-lifecycle")
|
//delete(controllerInitializers, "cloud-node-lifecycle")
|
||||||
|
|
||||||
// Here is an example to add an controller(NodeIpamController) which will be used by cloud provider
|
// Here is an example to add an controller(NodeIpamController) which will be used by cloud provider
|
||||||
// generate nodeIPAMConfig. Here is an sample code. Please pass the right parameter in your code.
|
// generate nodeIPAMConfig. Here is an sample code.
|
||||||
// If you do not need additional controller, please ignore.
|
// If you do not need additional controller, please ignore.
|
||||||
|
nodeIPAMControllerOptions.NodeIPAMControllerConfiguration = &nodeIPAMControllerConfiguration
|
||||||
|
fs := pflag.NewFlagSet("fs", pflag.ContinueOnError)
|
||||||
|
nodeIPAMControllerOptions.AddFlags(fs)
|
||||||
controllerInitializers["nodeipam"] = startNodeIpamControllerWrapper
|
controllerInitializers["nodeipam"] = startNodeIpamControllerWrapper
|
||||||
|
|
||||||
command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, controllerInitializers, wait.NeverStop)
|
command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, controllerInitializers, fs, wait.NeverStop)
|
||||||
|
|
||||||
// TODO: once we switch everything over to Cobra commands, we can go back to calling
|
// TODO: once we switch everything over to Cobra commands, we can go back to calling
|
||||||
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
|
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
|
||||||
|
@ -26,6 +26,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/spf13/pflag"
|
||||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||||
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
||||||
cacheddiscovery "k8s.io/client-go/discovery/cached"
|
cacheddiscovery "k8s.io/client-go/discovery/cached"
|
||||||
@ -65,7 +66,7 @@ const (
|
|||||||
|
|
||||||
// NewCloudControllerManagerCommand creates a *cobra.Command object with default parameters
|
// NewCloudControllerManagerCommand creates a *cobra.Command object with default parameters
|
||||||
// initFuncConstructor is a map of named controller groups (you can start more than one in an init func) paired to their InitFuncConstructor.
|
// initFuncConstructor is a map of named controller groups (you can start more than one in an init func) paired to their InitFuncConstructor.
|
||||||
func NewCloudControllerManagerCommand(s *options.CloudControllerManagerOptions, cloudInitializer InitCloudFunc, initFuncConstructor map[string]InitFuncConstructor, stopCh <-chan struct{}) *cobra.Command {
|
func NewCloudControllerManagerCommand(s *options.CloudControllerManagerOptions, cloudInitializer InitCloudFunc, initFuncConstructor map[string]InitFuncConstructor, additionalFlags *pflag.FlagSet, stopCh <-chan struct{}) *cobra.Command {
|
||||||
|
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: "cloud-controller-manager",
|
Use: "cloud-controller-manager",
|
||||||
@ -117,6 +118,9 @@ the cloud specific control loops shipped with Kubernetes.`,
|
|||||||
for _, f := range namedFlagSets.FlagSets {
|
for _, f := range namedFlagSets.FlagSets {
|
||||||
fs.AddFlagSet(f)
|
fs.AddFlagSet(f)
|
||||||
}
|
}
|
||||||
|
if additionalFlags != nil {
|
||||||
|
fs.AddFlagSet(additionalFlags)
|
||||||
|
}
|
||||||
usageFmt := "Usage:\n %s\n"
|
usageFmt := "Usage:\n %s\n"
|
||||||
cols, _, _ := term.TerminalSize(cmd.OutOrStdout())
|
cols, _, _ := term.TerminalSize(cmd.OutOrStdout())
|
||||||
cmd.SetUsageFunc(func(cmd *cobra.Command) error {
|
cmd.SetUsageFunc(func(cmd *cobra.Command) error {
|
||||||
|
@ -102,7 +102,7 @@ func StartTestServer(t Logger, customFlags []string) (result TestServer, err err
|
|||||||
}
|
}
|
||||||
return cloud
|
return cloud
|
||||||
}
|
}
|
||||||
command := app.NewCloudControllerManagerCommand(s, cloudInitializer, app.DefaultInitFuncConstructors, stopCh)
|
command := app.NewCloudControllerManagerCommand(s, cloudInitializer, app.DefaultInitFuncConstructors, nil, stopCh)
|
||||||
pflag.CommandLine.SetNormalizeFunc(flag.WordSepNormalizeFunc)
|
pflag.CommandLine.SetNormalizeFunc(flag.WordSepNormalizeFunc)
|
||||||
|
|
||||||
commandArgs := []string{}
|
commandArgs := []string{}
|
||||||
|
@ -48,7 +48,7 @@ func main() {
|
|||||||
klog.Fatalf("unable to initialize command options: %v", err)
|
klog.Fatalf("unable to initialize command options: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, app.DefaultInitFuncConstructors, wait.NeverStop)
|
command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, app.DefaultInitFuncConstructors, nil, wait.NeverStop)
|
||||||
|
|
||||||
// TODO: once we switch everything over to Cobra commands, we can go back to calling
|
// TODO: once we switch everything over to Cobra commands, we can go back to calling
|
||||||
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
|
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
|
||||||
|
Loading…
Reference in New Issue
Block a user