wip: controller flow

Signed-off-by: Artem Bortnikov <[email protected]>
aenix-io · Nov 14, 2024 · 768ac69 · 768ac69
1 parent 3d8b85c
commit 768ac69
Show file tree

Hide file tree

Showing 6 changed files with 435 additions and 19 deletions.
diff --git a/go.mod b/go.mod
@@ -12,6 +12,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.19.0
 	go.etcd.io/etcd/client/v3 v3.5.14
+	golang.org/x/sync v0.7.0
 	k8s.io/api v0.30.2
 	k8s.io/apimachinery v0.30.2
 	k8s.io/client-go v0.30.2

diff --git a/go.sum b/go.sum
@@ -190,6 +190,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

diff --git a/internal/controller/etcdcluster_controller.go b/internal/controller/etcdcluster_controller.go
@@ -102,27 +102,29 @@ func (r *EtcdClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	if client.IgnoreNotFound(err) != nil {
 		return ctrl.Result{}, fmt.Errorf("couldn't get statefulset: %w", err)
 	}
-	state.stsExists = state.statefulSet.UID != ""
+	// state.stsExists = state.statefulSet.UID != ""
 
 	// fetch endpoints
 	clusterClient, singleClients, err := factory.NewEtcdClientSet(ctx, state.instance, r.Client)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-	state.endpointsFound = clusterClient != nil && singleClients != nil
+	// state.endpointsFound = clusterClient != nil && singleClients != nil
 
-	if clusterClient != nil {
-		state.endpoints = clusterClient.Endpoints()
-	}
+	// if clusterClient != nil {
+	// 	state.endpoints = clusterClient.Endpoints()
+	// }
+	state.clusterClient = clusterClient
+	state.singleClients = singleClients
 
 	// fetch PVCs
 	state.pvcs, err = factory.PVCs(ctx, state.instance, r.Client)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
-	if !state.endpointsFound {
-		if !state.stsExists {
+	if !state.endpointsFound() {
+		if !state.statefulSetExists() {
 			return r.createClusterFromScratch(ctx, state) // TODO: needs implementing
 		}