fixup! tmp

apis/networking/v1alpha1/configuration_types.go

@@ -51,7 +51,7 @@ type ClusterConfig struct {
 // ConfigurationSpec defines the desired state of Configuration.
 type ConfigurationSpec struct {
 	// Local network configuration (the cluster where the resource is created).
-	Local ClusterConfig `json:"local,omitempty"`
+	Local *ClusterConfig `json:"local,omitempty"`
 	// Remote network configuration (the other cluster).
 	Remote ClusterConfig `json:"remote,omitempty"`
 }

cmd/liqo-controller-manager/main.go

@@ -161,6 +161,10 @@ func main() {
 		"The frequency of the ForeignCluster API server readiness check. Set 0 to disable the check")
 	foreignClusterPingTimeout := flag.Duration("foreign-cluster-ping-timeout", 5*time.Second,
 		"The timeout of the ForeignCluster API server readiness check")
+	var podCIDR argsutils.CIDR
+	flag.Var(&podCIDR, "pod-cidr", "The CIDR used to assign IP addresses to pods")
+	var externalCIDR argsutils.CIDR
+	flag.Var(&externalCIDR, "external-cidr", "The CIDR used to assign IP addresses to services")
 
 	// Discovery parameters
 	autoJoin := flag.Bool("auto-join-discovered-clusters", true, "Whether to automatically peer with discovered clusters")
@@ -626,7 +630,11 @@ func main() {
 			klog.Errorf("Unable to start the ipReconciler", err)
 			os.Exit(1)
 		}
-		cfgr := configurationcontroller.NewConfigurationReconciler(mgr.GetClient(), mgr.GetScheme(), mgr.GetEventRecorderFor("configuration-controller"))
+		cfgr := configurationcontroller.NewConfigurationReconciler(mgr.GetClient(), mgr.GetScheme(), mgr.GetEventRecorderFor("configuration-controller"),
+			networkingv1alpha1.ClusterConfigCIDR{
+				Pod:      networkingv1alpha1.CIDR(podCIDR.String()),
+				External: networkingv1alpha1.CIDR(externalCIDR.String()),
+			})
 		if err = cfgr.SetupWithManager(mgr); err != nil {
 			klog.Errorf("unable to create controller ConfigurationReconciler: %s", err)
 			os.Exit(1)

pkg/liqo-controller-manager/external-network/configuration-controller/configuration-controller.go

@@ -35,14 +35,19 @@ type ConfigurationReconciler struct {
 	client.Client
 	Scheme         *runtime.Scheme
 	EventsRecorder record.EventRecorder
+
+	localCIDR networkingv1alpha1.ClusterConfigCIDR
 }
 
 // NewConfigurationReconciler returns a new ConfigurationReconciler.
-func NewConfigurationReconciler(cl client.Client, s *runtime.Scheme, er record.EventRecorder) *ConfigurationReconciler {
+func NewConfigurationReconciler(cl client.Client, s *runtime.Scheme, er record.EventRecorder,
+	localCIDR networkingv1alpha1.ClusterConfigCIDR) *ConfigurationReconciler {
 	return &ConfigurationReconciler{
 		Client:         cl,
 		Scheme:         s,
 		EventsRecorder: er,
+
+		localCIDR: localCIDR,
 	}
 }
 
@@ -62,6 +67,14 @@ func (r *ConfigurationReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		}
 		return ctrl.Result{}, fmt.Errorf("unable to get the configuration %q: %w", req.NamespacedName, err)
 	}
+
+	if configuration.Spec.Local == nil {
+		err := r.DefaultLocalNetwork(ctx, configuration)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
 	events.Event(r.EventsRecorder, configuration, "Processing")
 
 	err := r.RemapConfiguration(ctx, configuration, r.EventsRecorder)
@@ -82,6 +95,13 @@ func (r *ConfigurationReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	return ctrl.Result{}, err
 }
 
+func (r *ConfigurationReconciler) DefaultLocalNetwork(ctx context.Context, cfg *networkingv1alpha1.Configuration) error {
+	cfg.Spec.Local = &networkingv1alpha1.ClusterConfig{
+		CIDR: r.localCIDR,
+	}
+	return r.Client.Update(ctx, cfg)
+}
+
 // RemapConfiguration remap the configuration using ipamv1alpha1.Network.
 func (r *ConfigurationReconciler) RemapConfiguration(ctx context.Context, cfg *networkingv1alpha1.Configuration,
 	er record.EventRecorder) error {