fix(capkk): add a lock to avoid duplicate IP assignments when creatin…

…g KKInstances concurrently Signed-off-by: 24sama <jacksama@foxmail.com>
kubesphere · Dec 20, 2022 · fb17c52 · fb17c52
1 parent db8aca4
commit fb17c52
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/controllers/kkinstance/kkinstance_controller.go b/controllers/kkinstance/kkinstance_controller.go
@@ -267,6 +267,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 
 	instanceScope, err := scope.NewInstanceScope(scope.InstanceScopeParams{
 		Client:       r.Client,
+		Logger:       &log,
 		Cluster:      cluster,
 		Machine:      machine,
 		InfraCluster: infraCluster,

diff --git a/controllers/kkmachine/helpers.go b/controllers/kkmachine/helpers.go
@@ -28,7 +28,6 @@ import (
 	capierrors "sigs.k8s.io/cluster-api/errors"
 	capiutil "sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/patch"
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "github.com/kubesphere/kubekey/v3/api/v1beta1"
@@ -37,8 +36,7 @@ import (
 
 func (r *Reconciler) createInstance(ctx context.Context, machineScope *scope.MachineScope,
 	kkInstanceScope scope.KKInstanceScope) (*infrav1.KKInstance, error) {
-	log := ctrl.LoggerFrom(ctx)
-	log.V(4).Info("Creating KKInstance")
+	machineScope.Info("Creating KKInstance")
 
 	if machineScope.Machine.Spec.Version == nil {
 		err := errors.New("Machine's spec.version must be defined")

diff --git a/controllers/kkmachine/kkmachine_controller.go b/controllers/kkmachine/kkmachine_controller.go
@@ -19,6 +19,7 @@ package kkmachine
 import (
 	"context"
 	"fmt"
+	"sync"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -62,6 +63,7 @@ const (
 // Reconciler reconciles a KKMachine object
 type Reconciler struct {
 	client.Client
+	mutex            sync.Mutex
 	Scheme           *runtime.Scheme
 	Recorder         record.EventRecorder
 	Tracker          *remote.ClusterCacheTracker
@@ -163,6 +165,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 	// Create the machine scope
 	machineScope, err := scope.NewMachineScope(scope.MachineScopeParams{
 		Client:       r.Client,
+		Logger:       &log,
 		Cluster:      cluster,
 		Machine:      machine,
 		InfraCluster: infraCluster,
@@ -291,7 +294,12 @@ func (r *Reconciler) reconcileNormal(ctx context.Context, machineScope *scope.Ma
 			}
 		}
 
+		if !r.mutex.TryLock() {
+			machineScope.V(4).Info("Waiting for the last KKInstance to be created")
+			return ctrl.Result{RequeueAfter: 2 * time.Second}, nil
+		}
 		instance, err = r.createInstance(ctx, machineScope, kkInstanceScope)
+		r.mutex.Unlock()
 		if err != nil {
 			machineScope.Error(err, "unable to create kkInstance")
 			r.Recorder.Eventf(machineScope.KKMachine, corev1.EventTypeWarning, "FailedCreate", "Failed to create kkInstance: %v", err)
@@ -379,7 +387,7 @@ func (r *Reconciler) findInstance(ctx context.Context, machineScope *scope.Machi
 
 	machineScope.V(4).Info("KKMachine has an instance id", "instance-id", pid.ID())
 	// If the ProviderID is populated, describe the instance using the ID.
-	id := pointer.StringPtr(pid.ID())
+	id := pointer.String(pid.ID())
 
 	obj := client.ObjectKey{
 		Namespace: machineScope.KKMachine.Namespace,

diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
@@ -93,7 +93,7 @@ variables:
   KUBERNETES_VERSION_MANAGEMENT: "v1.24.0"
   KUBERNETES_VERSION: "v1.24.0"
   IMAGE_REPOSITORY: "k8s.gcr.io"
-  CNI: "./data/cni/calico.yaml"
+  CNI: "../../data/cni/calico.yaml"
   EVENT_BRIDGE_INSTANCE_STATE: "true"
   EXP_CLUSTER_RESOURCE_SET: "true"
   IP_FAMILY: "IPv4"