fix rebase conflicts and broken tests

Author: Osselian

internal/controller/clusterResourceInteractions_test.go

@@ -701,13 +701,18 @@ var _ = Describe("CreateOrUpdateConditionalClusterObjects handlers", func() {
 				HaveField("Spec.Type", Equal(corev1.ServiceTypeLoadBalancer)),
 				HaveField("Spec.LoadBalancerClass", Equal(ptr.To("someClass"))),
 				HaveField("Spec.Ports", SatisfyAll(
-					HaveLen(1),
-					HaveEach(SatisfyAll(
-						HaveField("Name", Equal("client")),
-						HaveField("Port", Equal(int32(2379))),
-						HaveField("Protocol", Equal(corev1.ProtocolUDP)),
-					)),
-				)),
+					HaveLen(2),
+					ContainElements(
+						SatisfyAll(
+							HaveField("Name", Equal("client")),
+							HaveField("Port", Equal(int32(2379))),
+							HaveField("Protocol", Equal(corev1.ProtocolUDP))),
+						SatisfyAll(
+							HaveField("Name", Equal("metrics")),
+							HaveField("Port", Equal(int32(2381))),
+							HaveField("Protocol", Equal(corev1.ProtocolTCP)),
+						),
+					))),
 			))
 		})
 

internal/controller/factory/builders.go

@@ -47,7 +47,3 @@ func contextWithGVK(ctx context.Context, resource client.Object, scheme *runtime
 	ctx = log.WithValues(ctx, "group", gvk.GroupVersion().String(), "kind", gvk.Kind, "name", resource.GetName())
 	return ctx, nil
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)

internal/controller/factory/configmap.go

@@ -72,13 +72,9 @@ func TemplateClusterStateConfigMap(
 
 	initialClusterMembers := make([]string, replicas)
 	clusterService := fmt.Sprintf(
-<<<<<<< HEAD
 		"%s.%s.svc:2380",
 		GetHeadlessServiceName(cluster), cluster.Namespace)
 
-=======
-		"%s.%s.svc:2380", GetHeadlessServiceName(cluster), cluster.Namespace)
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 	for i := 0; i < replicas; i++ {
 		podName := fmt.Sprintf("%s-%d", cluster.Name, i)
 		initialClusterMembers[i] = fmt.Sprintf("%s=https://%s.%s",

internal/controller/factory/configmap_test.go

@@ -63,7 +63,6 @@ var _ = Describe("ClusterStateConfigMap factory", func() {
 			Eventually(Get(&etcdcluster)).Should(Succeed())
 			DeferCleanup(k8sClient.Delete, &etcdcluster)
 		})
-<<<<<<< HEAD
 
 		It("should successfully create the configmap object", func() {
 			By("processing new etcd cluster", func() {
@@ -113,16 +112,6 @@ var _ = Describe("ClusterStateConfigMap factory", func() {
 			Expect(err).ShouldNot(HaveOccurred())
 			Expect(configMapObj).NotTo(BeNil())
 			Expect(configMapObj.Data["ETCD_INITIAL_CLUSTER_STATE"]).To(Equal("existing"))
-=======
-
-		It("should successfully create the configmap object", func() {
-			By("processing new etcd cluster", func() {
-			 	configMapObj, err := GetClusterStateConfigMap(ctx, &etcdcluster, k8sClient)
-				Expect(err).ShouldNot(HaveOccurred())
-				Expect(configMapObj).NotTo(BeNil())
-				Expect(configMapObj.Data["ETCD_INITIAL_CLUSTER_STATE"]).To(Equal("new"))
-			})
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 		})
 	})
 })

internal/controller/factory/pdb.go

@@ -37,13 +37,10 @@ func GetPdb(
 ) (*v1.PodDisruptionBudget, error) {
 	var err error
 
-<<<<<<< HEAD
 	if cluster.Spec.PodDisruptionBudgetTemplate == nil {
 		return nil, fmt.Errorf("can't get pdb - PodDisruptionBudgetTemplate is nil")
 	}
 
-=======
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 	pdb := &v1.PodDisruptionBudget{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: cluster.Namespace,

internal/controller/factory/pdb_test.go

@@ -96,7 +96,6 @@ var _ = Describe("Pdb factory", func() {
 			pdbObj, err := GetPdb(ctx, &etcdcluster, k8sClient)
 			Expect(err).ShouldNot(HaveOccurred())
 			Expect(pdbObj).ShouldNot(BeNil())
-<<<<<<< HEAD
 		})
 	})
 
@@ -235,8 +234,6 @@ var _ = Describe("Pdb factory", func() {
 			pdbObj, err := GetPdb(ctx, &etcdcluster, k8sClient)
 			Expect(err).ShouldNot(HaveOccurred())
 			Expect(pdbObj.Spec.MinAvailable).To(Equal(ptr.To(intstr.FromInt32(1))))
-=======
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 		})
 	})
 })

internal/controller/factory/statefulset.go

@@ -46,21 +46,6 @@ func TemplateStatefulSet() *appsv1.StatefulSet {
 	panic("not yet implemented")
 }
 
-<<<<<<< HEAD
-=======
-func PodLabels(cluster *etcdaenixiov1alpha1.EtcdCluster) map[string]string {
-	labels := NewLabelsBuilder().WithName().WithInstance(cluster.Name).WithManagedBy()
-
-	if cluster.Spec.PodTemplate.Labels != nil {
-		for key, value := range cluster.Spec.PodTemplate.Labels {
-			labels[key] = value
-		}
-	}
-
-	return labels
-}
-
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 func GetStatefulSet(
 	ctx context.Context,
 	cluster *etcdaenixiov1alpha1.EtcdCluster,
@@ -147,58 +132,6 @@ func PodLabels(cluster *etcdaenixiov1alpha1.EtcdCluster) map[string]string {
 	return labels
 }
 
-<<<<<<< HEAD
-=======
-func generateVolumeMounts(cluster *etcdaenixiov1alpha1.EtcdCluster) []corev1.VolumeMount {
-
-	volumeMounts := []corev1.VolumeMount{}
-
-	volumeMounts = append(volumeMounts, corev1.VolumeMount{
-		Name:      "data",
-		ReadOnly:  false,
-		MountPath: "/var/run/etcd",
-	})
-
-	if cluster.Spec.Security != nil && cluster.Spec.Security.TLS.PeerSecret != "" {
-		volumeMounts = append(volumeMounts, []corev1.VolumeMount{
-			{
-				Name:      "peer-trusted-ca-certificate",
-				ReadOnly:  true,
-				MountPath: "/etc/etcd/pki/peer/ca",
-			},
-			{
-				Name:      "peer-certificate",
-				ReadOnly:  true,
-				MountPath: "/etc/etcd/pki/peer/cert",
-			},
-		}...)
-	}
-
-	if cluster.Spec.Security != nil && cluster.Spec.Security.TLS.ServerSecret != "" {
-		volumeMounts = append(volumeMounts, []corev1.VolumeMount{
-			{
-				Name:      "server-certificate",
-				ReadOnly:  true,
-				MountPath: "/etc/etcd/pki/server/cert",
-			},
-		}...)
-	}
-
-	if cluster.Spec.Security != nil && cluster.Spec.Security.TLS.ClientSecret != "" {
-
-		volumeMounts = append(volumeMounts, []corev1.VolumeMount{
-			{
-				Name:      "client-trusted-ca-certificate",
-				ReadOnly:  true,
-				MountPath: "/etc/etcd/pki/client/ca",
-			},
-		}...)
-	}
-
-	return volumeMounts
-}
-
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 func GenerateEtcdCommand() []string {
 	return []string{
 		"etcd",

internal/controller/factory/statefulset_test.go

@@ -17,26 +17,19 @@ limitations under the License.
 package factory
 
 import (
+	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/utils/ptr"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	. "sigs.k8s.io/controller-runtime/pkg/envtest/komega"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-<<<<<<< HEAD
 	. "sigs.k8s.io/controller-runtime/pkg/envtest/komega"
 
 	etcdaenixiov1alpha1 "github.com/aenix-io/etcd-operator/api/v1alpha1"
 	"github.com/google/uuid"
 	"k8s.io/apimachinery/pkg/types"
-=======
-
-	etcdaenixiov1alpha1 "github.com/aenix-io/etcd-operator/api/v1alpha1"
-	"k8s.io/apimachinery/pkg/types"
-	"github.com/google/uuid"
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 )
 
 var _ = Describe("StatefulSet factory", func() {
@@ -52,23 +45,14 @@ var _ = Describe("StatefulSet factory", func() {
 		DeferCleanup(k8sClient.Delete, ns)
 	})
 
-<<<<<<< HEAD
 	Context("PodLabels", func() {
 		It("should return base labels with custom labels merged", func() {
 			cluster := &etcdaenixiov1alpha1.EtcdCluster{
-=======
-	Context("when create statefulSet", func() {
-		var etcdcluster etcdaenixiov1alpha1.EtcdCluster
-
-		BeforeEach(func() {
-			etcdcluster = etcdaenixiov1alpha1.EtcdCluster{
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "test-cluster",
 				},
 				Spec: etcdaenixiov1alpha1.EtcdClusterSpec{},
 			}
-<<<<<<< HEAD
 
 			cluster.Spec.PodTemplate.Labels = map[string]string{
 				"custom-label":           "value",
@@ -89,19 +73,6 @@ var _ = Describe("StatefulSet factory", func() {
 			labels := PodLabels(cluster)
 			Expect(labels).Should(HaveLen(3))
 		})
-=======
-			Expect(k8sClient.Create(ctx, &etcdcluster)).Should(Succeed())
-			Eventually(Get(&etcdcluster)).Should(Succeed())
-			DeferCleanup(k8sClient.Delete, &etcdcluster)
-	
-		})
-		It("should successfully create statefulSet object with empty spec", func (){
-			statefulSetObj, err := GetStatefulSet(ctx, &etcdcluster, k8sClient)
-			Expect(err).ShouldNot(HaveOccurred())
-			Expect(statefulSetObj).ShouldNot(BeNil())
-		})
-
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 	})
 
 	Context("GenerateEtcdArgs", func() {

internal/controller/factory/suite_test.go

@@ -45,10 +45,7 @@ import (
 
 var cfg *rest.Config
 var k8sClient client.Client
-<<<<<<< HEAD
 
-=======
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 // var clientWithEmptyScheme client.Client
 var testEnv *envtest.Environment
 

internal/controller/factory/svc.go

@@ -98,11 +98,7 @@ func GetClientService(
 	ctx context.Context,
 	cluster *etcdaenixiov1alpha1.EtcdCluster,
 	rclient client.Client,
-<<<<<<< HEAD
 ) (*corev1.Service, error) {
-=======
-) (*corev1.Service, error)  {
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 	var err error
 
 	svc := corev1.Service{
@@ -141,9 +137,5 @@ func GetClientService(
 		return nil, fmt.Errorf("cannot set controller reference: %w", err)
 	}
 
-<<<<<<< HEAD
 	return &svc, nil
-=======
-	return &svc, nil 
->>>>>>> 641ff74 (move reconcileOwnedResource to reconcile utils)
 }