fix: add missing zone and region in InstanceV2

Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>

Author: Sh4d1

cmd/scaleway-cloud-controller-manager/main.go

@@ -44,6 +44,21 @@ func main() {
 	if err != nil {
 		klog.Fatalf("unable to initialize command options: %v", err)
 	}
+
+	fs := pflag.NewFlagSet("scaleway-cloud-controller-manager", pflag.ContinueOnError)
+	fs.SetNormalizeFunc(flag.WordSepNormalizeFunc)
+	for _, f := range s.Flags([]string{"cloud-node", "cloud-node-lifecycle", "service", "route"}, app.ControllersDisabledByDefault.List()).FlagSets {
+		fs.AddFlagSet(f)
+	}
+
+	err = fs.Parse(os.Args[1:])
+	if err != nil {
+		if err != pflag.ErrHelp {
+			klog.Errorf("could not parse arguments: %v", err)
+		}
+		os.Exit(1)
+	}
+
 	c, err := s.Config([]string{}, app.ControllersDisabledByDefault.List())
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
@@ -77,10 +92,6 @@ func main() {
 	controllerInitializers := app.DefaultControllerInitializers(c.Complete(), cloud)
 	command := app.NewCloudControllerManagerCommand(s, c, controllerInitializers)
 
-	// 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
-	// normalize func and add the go flag set by hand.
-	pflag.CommandLine.SetNormalizeFunc(flag.WordSepNormalizeFunc)
 	// utilflag.InitFlags()
 	logs.InitLogs()
 	defer logs.FlushLogs()

scaleway/baremetal.go

@@ -328,9 +328,16 @@ func (b *baremetal) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloud
 		return nil, err
 	}
 
+	region, err := bm.Zone.Region()
+	if err != nil {
+		return nil, err
+	}
+
 	return &cloudprovider.InstanceMetadata{
 		ProviderID:    BuildProviderID(InstanceTypeBaremtal, bm.Zone.String(), bm.ID),
 		InstanceType:  offerName,
 		NodeAddresses: baremetalAddresses(bm),
+		Region:        region.String(),
+		Zone:          bm.Zone.String(),
 	}, nil
 }

scaleway/instances.go

@@ -314,9 +314,16 @@ func (i *instances) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloud
 		return nil, err
 	}
 
+	region, err := instance.Zone.Region()
+	if err != nil {
+		return nil, err
+	}
+
 	return &cloudprovider.InstanceMetadata{
 		ProviderID:    BuildProviderID(InstanceTypeInstance, instance.Zone.String(), instance.ID),
 		InstanceType:  instance.CommercialType,
 		NodeAddresses: instanceAddresses(instance),
+		Region:        region.String(),
+		Zone:          instance.Zone.String(),
 	}, nil
 }