Remove repetitive value assignments in system tests

Author: ChunyiLyu

Diff for: system_tests/system_tests.go

@@ -43,14 +43,7 @@ var _ = Describe("Operator", func() {
 		)
 
 		BeforeEach(func() {
-			one := int32(1)
 			cluster = generateRabbitmqCluster(namespace, "basic-rabbit")
-			cluster.Spec.Replicas = &one
-			cluster.Spec.Service.Type = "NodePort"
-			cluster.Spec.Resources = &corev1.ResourceRequirements{
-				Requests: map[corev1.ResourceName]k8sresource.Quantity{},
-				Limits:   map[corev1.ResourceName]k8sresource.Quantity{},
-			}
 			Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
 			waitForRabbitmqRunning(cluster)
 
@@ -118,11 +111,6 @@ var _ = Describe("Operator", func() {
 
 		BeforeEach(func() {
 			cluster = generateRabbitmqCluster(namespace, "config-rabbit")
-			cluster.Spec.Resources = &corev1.ResourceRequirements{
-				Requests: map[corev1.ResourceName]k8sresource.Quantity{},
-				Limits:   map[corev1.ResourceName]k8sresource.Quantity{},
-			}
-
 			Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
 			waitForRabbitmqRunning(cluster)
 		})
@@ -186,7 +174,7 @@ cluster_keepalive_interval = 10000`
 				Expect(cfgMap).To(HaveKeyWithValue("cluster_partition_handling", "ignore"))
 			})
 
-			By("updating the advanced.config file when advancedConfig are modifed", func() {
+			By("updating the advanced.config file when advancedConfig are modified", func() {
 				Expect(updateRabbitmqCluster(ctx, rmqClusterClient, cluster.Name, cluster.Namespace, func(cluster *rabbitmqv1beta1.RabbitmqCluster) {
 					cluster.Spec.Rabbitmq.AdvancedConfig = `[
   {rabbit, [{auth_backends, [rabbit_auth_backend_ldap]}]}
@@ -238,11 +226,6 @@ CONSOLE_LOG=new`
 
 		BeforeEach(func() {
 			cluster = generateRabbitmqCluster(namespace, "persistence-rabbit")
-			cluster.Spec.Service.Type = "NodePort"
-			cluster.Spec.Resources = &corev1.ResourceRequirements{
-				Requests: map[corev1.ResourceName]k8sresource.Quantity{},
-				Limits:   map[corev1.ResourceName]k8sresource.Quantity{},
-			}
 			Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
 
 			waitForRabbitmqRunning(cluster)
@@ -293,11 +276,7 @@ CONSOLE_LOG=new`
 				three := int32(3)
 				cluster = generateRabbitmqCluster(namespace, "ha-rabbit")
 				cluster.Spec.Replicas = &three
-				cluster.Spec.Service.Type = "NodePort"
-				cluster.Spec.Resources = &corev1.ResourceRequirements{
-					Requests: map[corev1.ResourceName]k8sresource.Quantity{},
-					Limits:   map[corev1.ResourceName]k8sresource.Quantity{},
-				}
+
 				Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
 				waitForRabbitmqRunning(cluster)
 			})
@@ -333,11 +312,6 @@ CONSOLE_LOG=new`
 
 			BeforeEach(func() {
 				cluster = generateRabbitmqCluster(namespace, "tls-test-rabbit")
-				cluster.Spec.Service.Type = "NodePort"
-				cluster.Spec.Resources = &corev1.ResourceRequirements{
-					Requests: map[corev1.ResourceName]k8sresource.Quantity{},
-					Limits:   map[corev1.ResourceName]k8sresource.Quantity{},
-				}
 				Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
 				waitForRabbitmqRunning(cluster)
 

Diff for: system_tests/utils.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	k8sresource "k8s.io/apimachinery/pkg/api/resource"
 	"log"
 	"net/http"
 	"os"
@@ -382,6 +383,13 @@ func generateRabbitmqCluster(namespace, instanceName string) *rabbitmqv1beta1.Ra
 		},
 		Spec: rabbitmqv1beta1.RabbitmqClusterSpec{
 			Replicas: &one,
+			Service: rabbitmqv1beta1.RabbitmqClusterServiceSpec{
+				Type: "NodePort",
+			},
+			Resources: &corev1.ResourceRequirements{
+				Requests: map[corev1.ResourceName]k8sresource.Quantity{},
+				Limits:   map[corev1.ResourceName]k8sresource.Quantity{},
+			},
 		},
 	}
 }