Merge pull request #175 from kajinamit/replicas-type

Fix defaulting of Replicas spec

api/v1beta1/horizon_types.go

@@ -42,7 +42,7 @@ type HorizonSpec struct {
 	// +kubebuilder:validation:Maximum=32
 	// +kubebuilder:validation:Minimum=0
 	// Replicas of horizon API to run
-	Replicas int32 `json:"replicas"`
+	Replicas *int32 `json:"replicas"`
 
 	// +kubebuilder:validation:Required
 	// Secret containing OpenStack password information for Horizon Secret Key

pkg/horizon/deployment.go

@@ -91,7 +91,7 @@ func Deployment(instance *horizonv1.Horizon, configHash string, labels map[strin
 			Selector: &metav1.LabelSelector{
 				MatchLabels: labels,
 			},
-			Replicas: &instance.Spec.Replicas,
+			Replicas: instance.Spec.Replicas,
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: labels,

tests/functional/horizon_controller_test.go

@@ -49,6 +49,7 @@ var _ = Describe("Horizon controller", func() {
 		It("should have the Spec and Status fields initialized", func() {
 			horizon := GetHorizon(horizonName)
 			Expect(horizon.Spec.Secret).Should(Equal("test-osp-secret"))
+			Expect(*(horizon.Spec.Replicas)).Should(Equal(int32(1)))
 		})
 
 		It("should have a finalizer", func() {
@@ -230,7 +231,7 @@ var _ = Describe("Horizon controller", func() {
 			})
 			keystoneAPI := th.CreateKeystoneAPI(namespace)
 			DeferCleanup(th.DeleteKeystoneAPI, keystoneAPI)
-			th.SimulateDeploymentReadyWithPods(deploymentName, map[string][]string{})
+			th.SimulateDeploymentReplicaReady(deploymentName)
 		})
 
 		It("should have deployment ready", func() {
@@ -248,8 +249,9 @@ var _ = Describe("Horizon controller", func() {
 			)
 		})
 		It("should have ReadyCount set", func() {
-			horizon := GetHorizon(horizonName)
-			Expect(horizon.Status.ReadyCount).Should(Equal(horizon.Spec.Replicas))
+			Eventually(func() int32 {
+				return GetHorizon(horizonName).Status.ReadyCount
+			}, timeout, interval).Should(Equal(int32(1)))
 		})
 	})
 })