Merge pull request #352 from rabbitmq/small-things

Small refactor

Author: ChunyiLyu

Diff for: api/v1beta1/rabbitmqcluster_types.go

@@ -22,13 +22,13 @@ import (
 )
 
 const (
-	rabbitmqImage             string             = "rabbitmq:3.8.8"
-	defaultPersistentCapacity string             = "10Gi"
-	defaultMemoryLimit        string             = "2Gi"
-	defaultCPULimit           string             = "2000m"
-	defaultMemoryRequest      string             = "2Gi"
-	defaultCPURequest         string             = "1000m"
-	defaultServiceType        corev1.ServiceType = corev1.ServiceTypeClusterIP
+	rabbitmqImage             string = "rabbitmq:3.8.8"
+	defaultPersistentCapacity string = "10Gi"
+	defaultMemoryLimit        string = "2Gi"
+	defaultCPULimit           string = "2000m"
+	defaultMemoryRequest      string = "2Gi"
+	defaultCPURequest         string = "1000m"
+	defaultServiceType               = corev1.ServiceTypeClusterIP
 )
 
 // +kubebuilder:object:root=true
@@ -423,7 +423,7 @@ var rabbitmqClusterDefaults = RabbitmqCluster{
 }
 
 func MergeDefaults(current RabbitmqCluster) *RabbitmqCluster {
-	var mergedRabbitmq RabbitmqCluster = current
+	var mergedRabbitmq = current
 
 	emptyRabbitmq := RabbitmqCluster{}
 	// Note: we do not check for ImagePullSecret or StorageClassName since the default and nil value are both "".

Diff for: controllers/rabbitmqcluster_controller_test.go

@@ -157,7 +157,7 @@ func (builder *ClientServiceBuilder) updatePorts(servicePorts []corev1.ServicePo
 		}
 	}
 
-	updatedServicePorts := []corev1.ServicePort{}
+	var updatedServicePorts []corev1.ServicePort
 
 	for _, servicePort := range servicePorts {
 		if value, exists := servicePortsMap[servicePort.Name]; exists {

Diff for: internal/resource/client_service.go

@@ -246,7 +246,7 @@ func (builder *StatefulSetBuilder) podTemplateSpec(annotations, labels map[strin
 	memoryRequest := k8sresource.MustParse(initContainerMemory)
 
 	//Image Pull Secret
-	imagePullSecrets := []corev1.LocalObjectReference{}
+	var imagePullSecrets []corev1.LocalObjectReference
 	if builder.Instance.Spec.ImagePullSecret != "" {
 		imagePullSecrets = append(imagePullSecrets, corev1.LocalObjectReference{Name: builder.Instance.Spec.ImagePullSecret})
 	}

Diff for: internal/resource/statefulset.go

@@ -22,7 +22,7 @@ var _ = Describe("Status", func() {
 			someCondition = RabbitmqClusterCondition{
 				Type:               "a-type",
 				Status:             "some-status",
-				LastTransitionTime: (*someConditionTime.DeepCopy()),
+				LastTransitionTime: *someConditionTime.DeepCopy(),
 				Reason:             "reasons",
 				Message:            "ship-it",
 			}

Diff for: internal/status/status_test.go

@@ -52,9 +52,7 @@ var _ = Describe("Operator", func() {
 				Limits:   map[corev1.ResourceName]k8sresource.Quantity{},
 			}
 			Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
-
 			waitForRabbitmqRunning(cluster)
-			waitForClusterAvailable(cluster)
 
 			hostname = kubernetesNodeIp(ctx, clientSet)
 			port = rabbitmqNodePort(ctx, clientSet, cluster, "management")
@@ -342,7 +340,6 @@ CONSOLE_LOG=new`
 				}
 				Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
 				waitForRabbitmqRunning(cluster)
-				waitForClusterAvailable(cluster)
 
 				// Passing a single hostname for certificate creation works because
 				// the AMPQS client is connecting using the same hostname
@@ -412,7 +409,6 @@ CONSOLE_LOG=new`
 			}
 			Expect(createRabbitmqCluster(ctx, rmqClusterClient, cluster)).To(Succeed())
 			waitForRabbitmqRunning(cluster)
-			waitForClusterAvailable(cluster)
 
 			hostname = kubernetesNodeIp(ctx, clientSet)
 			var err error

Diff for: system_tests/system_tests.go

@@ -151,7 +151,7 @@ func getMessageFromQueue(rabbitmqHostName, rabbitmqPort, rabbitmqUsername, rabbi
 		return nil, err
 	}
 
-	messages := []Message{}
+	var messages []Message
 	err = json.Unmarshal(response, &messages)
 	if err != nil {
 		return nil, err
@@ -458,7 +458,7 @@ func rabbitmqNodePort(ctx context.Context, clientSet *kubernetes.Clientset, clus
 
 func waitForTLSUpdate(cluster *rabbitmqv1beta1.RabbitmqCluster) {
 	waitForRabbitmqNotRunningWithOffset(cluster, 2)
-	waitForClusterAvailable(cluster)
+	waitForRabbitmqRunning(cluster)
 }
 
 func waitForRabbitmqUpdate(cluster *rabbitmqv1beta1.RabbitmqCluster) {
@@ -470,33 +470,6 @@ func waitForRabbitmqRunning(cluster *rabbitmqv1beta1.RabbitmqCluster) {
 	waitForRabbitmqRunningWithOffset(cluster, 2)
 }
 
-func waitForClusterAvailable(cluster *rabbitmqv1beta1.RabbitmqCluster) {
-	waitForClusterAvailableWithOffset(cluster, 2)
-}
-
-func waitForClusterAvailableWithOffset(cluster *rabbitmqv1beta1.RabbitmqCluster, callStackOffset int) {
-	var err error
-
-	EventuallyWithOffset(callStackOffset, func() string {
-		output, err := kubectl(
-			"-n",
-			cluster.Namespace,
-			"get",
-			"rabbitmqclusters",
-			cluster.Name,
-			"-ojsonpath='{.status.conditions[?(@.type==\"ClusterAvailable\")].status}'",
-		)
-
-		if err != nil {
-			Expect(string(output)).To(ContainSubstring("not found"))
-		}
-
-		return string(output)
-	}, podCreationTimeout, 1).Should(Equal("'True'"))
-
-	ExpectWithOffset(callStackOffset, err).NotTo(HaveOccurred())
-}
-
 func waitForRabbitmqNotRunningWithOffset(cluster *rabbitmqv1beta1.RabbitmqCluster, callStackOffset int) {
 	var err error