@@ -23,115 +23,46 @@ import (
2323 goflag "flag"
2424 "fmt"
2525 "math/rand"
26- "net/http"
2726 "os"
2827 "time"
2928
29+ "github.com/spf13/pflag"
3030 "k8s.io/apimachinery/pkg/util/wait"
31- "k8s.io/apiserver/pkg/server/healthz"
3231 cloudprovider "k8s.io/cloud-provider"
33- "k8s.io/cloud-provider-openstack/pkg/openstack"
34- "k8s.io/cloud-provider-openstack/pkg/version"
3532 "k8s.io/cloud-provider/app"
33+ "k8s.io/cloud-provider/app/config"
3634 "k8s.io/cloud-provider/options"
37- "k8s.io/component-base/cli/flag"
35+ cliflag "k8s.io/component-base/cli/flag"
3836 "k8s.io/component-base/logs"
3937 _ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration
4038 _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration
4139 "k8s.io/klog/v2"
4240 _ "k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates
4341
44- "github.com/spf13/cobra"
45- "github.com/spf13/pflag"
46- )
47-
48- func init () {
49- mux := http .NewServeMux ()
50- healthz .InstallHandler (mux )
51- }
52-
53- var (
54- versionFlag bool
42+ "k8s.io/cloud-provider-openstack/pkg/openstack"
43+ "k8s.io/cloud-provider-openstack/pkg/version"
5544)
5645
5746func main () {
58- rand .Seed (time .Now ().UTC ().UnixNano ())
59-
60- goflag .CommandLine .Parse ([]string {})
61- controllerList := []string {"cloud-node" , "cloud-node-lifecycle" , "service" , "route" }
47+ rand .Seed (time .Now ().UnixNano ())
6248
63- s , err := options .NewCloudControllerManagerOptions ()
49+ ccmOptions , err := options .NewCloudControllerManagerOptions ()
6450 if err != nil {
6551 klog .Fatalf ("unable to initialize command options: %v" , err )
6652 }
67- s .KubeCloudShared .CloudProvider .Name = openstack .ProviderName
68-
69- command := & cobra.Command {
70- Use : "openstack-cloud-controller-manager" ,
71- Long : `The Cloud controller manager is a daemon that embeds
72- the cloud specific control loops shipped with Kubernetes.` ,
73- PersistentPreRun : func (cmd * cobra.Command , args []string ) {
74- // Glog requires this otherwise it complains.
75- goflag .CommandLine .Parse (nil )
76-
77- // This is a temporary hack to enable proper logging until upstream dependencies
78- // are migrated to fully utilize klog instead of glog.
79- klogFlags := goflag .NewFlagSet ("klog" , goflag .ExitOnError )
80- klog .InitFlags (klogFlags )
81-
82- // Sync the glog and klog flags.
83- cmd .Flags ().VisitAll (func (f1 * pflag.Flag ) {
84- f2 := klogFlags .Lookup (f1 .Name )
85- if f2 != nil {
86- value := f1 .Value .String ()
87- f2 .Value .Set (value )
88- }
89- })
90- },
91- Run : func (cmd * cobra.Command , args []string ) {
92- if versionFlag {
93- version .PrintVersionAndExit ()
94- }
95-
96- flag .PrintFlags (cmd .Flags ())
97-
98- c , err := s .Config (controllerList , app .ControllersDisabledByDefault .List ())
99- if err != nil {
100- fmt .Fprintf (os .Stderr , "%v\n " , err )
101- os .Exit (1 )
102- }
103-
104- cloudconfig := c .Complete ().ComponentConfig .KubeCloudShared .CloudProvider
105- cloud , err := cloudprovider .InitCloudProvider (cloudconfig .Name , cloudconfig .CloudConfigFile )
106- if err != nil {
107- klog .Fatalf ("Cloud provider could not be initialized: %v" , err )
108- }
109- if cloud == nil {
110- klog .Fatalf ("cloud provider is nil" )
111- }
112-
113- if err := app .Run (c .Complete (), app .DefaultControllerInitializers (c .Complete (), cloud ), wait .NeverStop ); err != nil {
114- fmt .Fprintf (os .Stderr , "%v\n " , err )
115- os .Exit (1 )
116- }
117- },
118- }
11953
120- fs := command .Flags ()
121- namedFlagSets := s .Flags (controllerList , app .ControllersDisabledByDefault .List ())
122- for _ , f := range namedFlagSets .FlagSets {
123- fs .AddFlagSet (f )
124- }
125-
126- fs .BoolVar (& versionFlag , "version" , false , "Print version and exit" )
54+ fss := cliflag.NamedFlagSets {}
55+ command := app .NewCloudControllerManagerCommand (ccmOptions , cloudInitializer , app .DefaultInitFuncConstructors , fss , wait .NeverStop )
12756
12857 openstack .AddExtraFlags (pflag .CommandLine )
12958
13059 // TODO: once we switch everything over to Cobra commands, we can go back to calling
13160 // utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
13261 // normalize func and add the go flag set by hand.
133- pflag .CommandLine .SetNormalizeFunc (flag .WordSepNormalizeFunc )
62+ // Here is an sample
63+ pflag .CommandLine .SetNormalizeFunc (cliflag .WordSepNormalizeFunc )
13464 pflag .CommandLine .AddGoFlagSet (goflag .CommandLine )
65+
13566 // utilflag.InitFlags()
13667 logs .InitLogs ()
13768 defer logs .FlushLogs ()
@@ -143,3 +74,25 @@ the cloud specific control loops shipped with Kubernetes.`,
14374 os .Exit (1 )
14475 }
14576}
77+
78+ func cloudInitializer (config * config.CompletedConfig ) cloudprovider.Interface {
79+ cloudConfig := config .ComponentConfig .KubeCloudShared .CloudProvider
80+
81+ // initialize cloud provider with the cloud provider name and config file provided
82+ cloud , err := cloudprovider .InitCloudProvider (cloudConfig .Name , cloudConfig .CloudConfigFile )
83+ if err != nil {
84+ klog .Fatalf ("Cloud provider could not be initialized: %v" , err )
85+ }
86+ if cloud == nil {
87+ klog .Fatalf ("Cloud provider is nil" )
88+ }
89+
90+ if ! cloud .HasClusterID () {
91+ if config .ComponentConfig .KubeCloudShared .AllowUntaggedCloud {
92+ klog .Warning ("detected a cluster without a ClusterID. A ClusterID will be required in the future. Please tag your cluster to avoid any future issues" )
93+ } else {
94+ klog .Fatalf ("no ClusterID found. A ClusterID is required for the cloud provider to function properly. This check can be bypassed by setting the allow-untagged-cloud option" )
95+ }
96+ }
97+ return cloud
98+ }
0 commit comments