fix cluster client creation, replace panics with error returns

Author: lllamnyp

cmd/app/commandline.go

@@ -29,6 +29,7 @@ import (
 
 type Flags struct {
 	Kubeconfig       string
+	ClusterDomain    string
 	MetricsAddress   string
 	ProbeAddress     string
 	LeaderElection   bool
@@ -47,6 +48,7 @@ func ParseCmdLine() Flags {
 	pflag.CommandLine = pflag.NewFlagSet(os.Args[0], pflag.ContinueOnError)
 
 	pflag.String("kubeconfig", "", "Path to a kubeconfig. Only required if out-of-cluster.")
+	pflag.String("cluster-domain", "cluster.local", "The cluster domain configured in kube-dns")
 	pflag.String("metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	pflag.String("health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	pflag.Bool("leader-elect", false, "Enable leader election for controller manager. "+
@@ -78,6 +80,7 @@ func ParseCmdLine() Flags {
 
 	return Flags{
 		Kubeconfig:       viper.GetString("kubeconfig"),
+		ClusterDomain:    viper.GetString("cluster-domain"),
 		MetricsAddress:   viper.GetString("metrics-bind-address"),
 		ProbeAddress:     viper.GetString("health-probe-bind-address"),
 		LeaderElection:   viper.GetBool("leader-elect"),

internal/controller/etcdcluster_controller.go

@@ -706,23 +706,23 @@ func (r *EtcdClusterReconciler) createClusterFromScratch(ctx context.Context, st
 // TODO!
 // nolint:unused
 func (r *EtcdClusterReconciler) scaleUpFromZero(ctx context.Context) error {
-	panic("not yet implemented")
+	return fmt.Errorf("not yet implemented")
 }
 
 // TODO!
 // nolint:unused
 func (r *EtcdClusterReconciler) createOrUpdateClusterStateConfigMap(ctx context.Context) error {
-	panic("not yet implemented")
+	return fmt.Errorf("not yet implemented")
 }
 
 // TODO!
 // nolint:unused
 func (r *EtcdClusterReconciler) createOrUpdateStatefulSet(ctx context.Context) error {
-	panic("not yet implemented")
+	return fmt.Errorf("not yet implemented")
 }
 
 // TODO!
 // nolint:unused
 func (r *EtcdClusterReconciler) promoteLearners(ctx context.Context) error {
-	panic("not yet implemented")
+	return fmt.Errorf("not yet implemented")
 }

internal/controller/factory/etcd_client.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/aenix-io/etcd-operator/api/v1alpha1"
+	"github.com/spf13/viper"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -56,7 +57,7 @@ func configFromCluster(ctx context.Context, cluster *v1alpha1.EtcdCluster, cli c
 		}
 	}
 	for name := range names {
-		urls = append(urls, fmt.Sprintf("%s:%s", name, "2379"))
+		urls = append(urls, fmt.Sprintf("%s.%s.%s.svc.%s:%s", name, ep.Name, cluster.Namespace, viper.GetString("cluster-domain"), "2379"))
 	}
 
 	return clientv3.Config{Endpoints: urls}, nil

internal/controller/observables.go

@@ -52,7 +52,7 @@ func (o *observables) setClusterID() {
 // Also if members have different opinions on the list of members, this is
 // also a splitbrain.
 func (o *observables) inSplitbrain() bool {
-	return o.clusterIDsAllEqual() && o.memberListsAllEqual()
+	return !o.clusterIDsAllEqual() || !o.memberListsAllEqual()
 }
 
 func (o *observables) clusterIDsAllEqual() bool {
@@ -184,12 +184,22 @@ func (o *observables) statefulSetReady() bool {
 	return o.statefulSet.Status.ReadyReplicas == *o.statefulSet.Spec.Replicas
 }
 
-// TODO:
 func (o *observables) clusterHasQuorum() bool {
-	return false
+	size := len(o.etcdStatuses)
+	membersInQuorum := size
+	for i := range o.etcdStatuses {
+		if o.etcdStatuses[i].endpointStatus == nil || o.etcdStatuses[i].endpointStatus.Leader == 0 {
+			membersInQuorum--
+		}
+	}
+	return membersInQuorum*2 > size
 }
 
-// TODO:
 func (o *observables) hasLearners() bool {
+	for i := range o.etcdStatuses {
+		if stat := o.etcdStatuses[i].endpointStatus; stat != nil && stat.IsLearner {
+			return true
+		}
+	}
 	return false
 }