Remove redundant type conversions and annotations

Author: ChunyiLyu

api/v1beta1/rabbitmqcluster_types_test.go

@@ -163,7 +163,7 @@ var _ = Describe("RabbitmqCluster", func() {
 						Image:           "rabbitmq-image-from-cr",
 						ImagePullSecret: "my-super-secret",
 						Service: RabbitmqClusterServiceSpec{
-							Type: corev1.ServiceType("this-is-a-service"),
+							Type: "this-is-a-service",
 							Annotations: map[string]string{
 								"myannotation": "is-set",
 							},
@@ -186,7 +186,7 @@ var _ = Describe("RabbitmqCluster", func() {
 							NodeAffinity: &corev1.NodeAffinity{
 								RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
 									NodeSelectorTerms: []corev1.NodeSelectorTerm{
-										corev1.NodeSelectorTerm{
+										{
 											MatchExpressions: []corev1.NodeSelectorRequirement{
 												{
 													Key:      "somekey",
@@ -201,7 +201,7 @@ var _ = Describe("RabbitmqCluster", func() {
 							},
 						},
 						Tolerations: []corev1.Toleration{
-							corev1.Toleration{
+							{
 								Key:      "mykey",
 								Operator: "NotEqual",
 								Value:    "myvalue",
@@ -325,15 +325,15 @@ var _ = Describe("RabbitmqCluster", func() {
 
 		It("updates an arbitrary condition", func() {
 			someCondition := status.RabbitmqClusterCondition{}
-			someCondition.Type = status.RabbitmqClusterConditionType("a-type")
+			someCondition.Type = "a-type"
 			someCondition.Reason = "whynot"
-			someCondition.Status = corev1.ConditionStatus("perhaps")
+			someCondition.Status = "perhaps"
 			someCondition.LastTransitionTime = metav1.Unix(10, 0)
 			rmqStatus := RabbitmqClusterStatus{
 				Conditions: []status.RabbitmqClusterCondition{someCondition},
 			}
 
-			rmqStatus.SetCondition(status.RabbitmqClusterConditionType("a-type"),
+			rmqStatus.SetCondition("a-type",
 				corev1.ConditionTrue, "some-reason", "my-message")
 
 			updatedCondition := rmqStatus.Conditions[0]

internal/resource/client_service.go

@@ -52,7 +52,7 @@ func (builder *ClientServiceBuilder) Update(object runtime.Object) error {
 	service := object.(*corev1.Service)
 	builder.setAnnotations(service)
 	service.Labels = metadata.GetLabels(builder.Instance.Name, builder.Instance.Labels)
-	service.Spec.Type = corev1.ServiceType(builder.Instance.Spec.Service.Type)
+	service.Spec.Type = builder.Instance.Spec.Service.Type
 	service.Spec.Selector = metadata.LabelSelector(builder.Instance.Name)
 
 	service.Spec.Ports = builder.updatePorts(service.Spec.Ports)

internal/resource/client_service_test.go

@@ -334,13 +334,13 @@ var _ = Context("ClientServices", func() {
 			It("preserves the same node ports after updating from LoadBalancer to NodePort", func() {
 				svc.Spec.Type = corev1.ServiceTypeLoadBalancer
 				svc.Spec.Ports = []corev1.ServicePort{
-					corev1.ServicePort{
+					{
 						Protocol: corev1.ProtocolTCP,
 						Port:     5672,
 						Name:     "amqp",
 						NodePort: 12345,
 					},
-					corev1.ServicePort{
+					{
 						Protocol: corev1.ProtocolTCP,
 						Port:     15672,
 						Name:     "management",
@@ -372,7 +372,7 @@ var _ = Context("ClientServices", func() {
 			It("unsets nodePort after updating from NodePort to ClusterIP", func() {
 				svc.Spec.Type = corev1.ServiceTypeNodePort
 				svc.Spec.Ports = []corev1.ServicePort{
-					corev1.ServicePort{
+					{
 						Protocol: corev1.ProtocolTCP,
 						Port:     5672,
 						Name:     "amqp",
@@ -399,7 +399,7 @@ var _ = Context("ClientServices", func() {
 			It("unsets the service type and node ports when service type is deleted from CR spec", func() {
 				svc.Spec.Type = corev1.ServiceTypeNodePort
 				svc.Spec.Ports = []corev1.ServicePort{
-					corev1.ServicePort{
+					{
 						Protocol: corev1.ProtocolTCP,
 						Port:     5672,
 						Name:     "amqp",

internal/resource/statefulset_test.go

@@ -1409,7 +1409,7 @@ func generateRabbitmqCluster() rabbitmqv1beta1.RabbitmqCluster {
 			Image:           "rabbitmq-image-from-cr",
 			ImagePullSecret: "my-super-secret",
 			Service: rabbitmqv1beta1.RabbitmqClusterServiceSpec{
-				Type:        corev1.ServiceType("this-is-a-service"),
+				Type:        "this-is-a-service",
 				Annotations: map[string]string{},
 			},
 			Persistence: rabbitmqv1beta1.RabbitmqClusterPersistenceSpec{
@@ -1430,7 +1430,7 @@ func generateRabbitmqCluster() rabbitmqv1beta1.RabbitmqCluster {
 				NodeAffinity: &corev1.NodeAffinity{
 					RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
 						NodeSelectorTerms: []corev1.NodeSelectorTerm{
-							corev1.NodeSelectorTerm{
+							{
 								MatchExpressions: []corev1.NodeSelectorRequirement{
 									{
 										Key:      "somekey",
@@ -1445,7 +1445,7 @@ func generateRabbitmqCluster() rabbitmqv1beta1.RabbitmqCluster {
 				},
 			},
 			Tolerations: []corev1.Toleration{
-				corev1.Toleration{
+				{
 					Key:      "mykey",
 					Operator: "NotEqual",
 					Value:    "myvalue",

internal/status/status_test.go

@@ -20,16 +20,16 @@ var _ = Describe("Status", func() {
 		BeforeEach(func() {
 			someConditionTime = metav1.Unix(1, 1)
 			someCondition = RabbitmqClusterCondition{
-				Type:               RabbitmqClusterConditionType("a-type"),
-				Status:             corev1.ConditionStatus("some-status"),
+				Type:               "a-type",
+				Status:             "some-status",
 				LastTransitionTime: (*someConditionTime.DeepCopy()),
 				Reason:             "reasons",
 				Message:            "ship-it",
 			}
 		})
 
 		It("changes the status and transition time", func() {
-			someCondition.UpdateState(corev1.ConditionStatus("maybe"))
+			someCondition.UpdateState("maybe")
 			Expect(someCondition.Status).To(Equal(corev1.ConditionStatus("maybe")))
 
 			Expect(someCondition.LastTransitionTime).NotTo(Equal(someConditionTime))
@@ -38,7 +38,7 @@ var _ = Describe("Status", func() {
 		})
 
 		It("preserves the status and transtion time", func() {
-			someCondition.UpdateState(corev1.ConditionStatus("some-status"))
+			someCondition.UpdateState("some-status")
 			Expect(someCondition.Status).To(Equal(corev1.ConditionStatus("some-status")))
 			Expect(someCondition.LastTransitionTime).To(Equal(someConditionTime))
 		})