feat(health-check): increase timeout and validate ready replicas for status. (#219) (#221)

* feat(health-check): increase timeout and validate ready replicas for status.

* feat(health-check): fix unit tests.

* fix(build): set up Go in github action.

(cherry picked from commit 3d409c8)

Author: Cristhian Castaneda

.github/workflows/build.yml

@@ -16,6 +16,11 @@ jobs:
       - name: Fetch full history
         run: git fetch --prune --tags --unshallow
 
+      - name: Set up Go 1.13.15
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.13.15
+
       - name: Determine build type
         id: build_type
         run: |

pkg/controller/spinnakerservice/status.go

@@ -46,6 +46,7 @@ func (s *statusChecker) checks(instance interfaces.SpinnakerService) error {
 	}
 
 	var pods []v1.Pod
+	var replicasReady []bool
 
 	for i := range deployments {
 		deployment := deployments[i]
@@ -56,7 +57,7 @@ func (s *statusChecker) checks(instance interfaces.SpinnakerService) error {
 			ReadyReplicas: deployment.Status.ReadyReplicas,
 			Image:         s.k8sLookup.GetSpinnakerServiceImageFromDeployment(deployment.Spec.Template.Spec),
 		}
-
+		replicasReady = append(replicasReady, deployment.Status.Replicas == deployment.Status.ReadyReplicas)
 		pd, err := s.k8sLookup.GetPodsByDeployment(instance, deployment)
 		if err != nil {
 			return err
@@ -69,6 +70,12 @@ func (s *statusChecker) checks(instance interfaces.SpinnakerService) error {
 	if err != nil {
 		return err
 	}
+	if spinsvcStatus == Updating {
+		areReplicasReady := s.replicasReady(replicasReady)
+		if areReplicasReady {
+			spinsvcStatus = Ok
+		}
+	}
 	status.Status = spinsvcStatus
 	status.Services = svcs
 	status.ServiceCount = len(status.Services)
@@ -82,6 +89,16 @@ func (s *statusChecker) checks(instance interfaces.SpinnakerService) error {
 	return nil
 }
 
+// getStatus check spinnaker status
+func (s *statusChecker) replicasReady(replicasReady []bool) bool {
+	for _, v := range replicasReady {
+		if !v {
+			return false
+		}
+	}
+	return true
+}
+
 // getStatus check spinnaker status
 func (s *statusChecker) getStatus(instance interfaces.SpinnakerService, pods []v1.Pod) (string, error) {
 	status := Ok

pkg/controller/spinnakerservice/status_test.go

@@ -101,7 +101,12 @@ func Test_statusChecker_checks(t *testing.T) {
 						},
 					},
 				}},
-				mockedDeployments:  []appsv1.Deployment{{}},
+				mockedDeployments: []appsv1.Deployment{{
+					Status: appsv1.DeploymentStatus{
+						Replicas:      int32(1),
+						ReadyReplicas: int32(0),
+					},
+				}},
 				mockedExceededTime: false,
 			},
 			wantErr: false,
@@ -174,7 +179,12 @@ func Test_statusChecker_checks(t *testing.T) {
 					},
 				},
 				},
-				mockedDeployments:  []appsv1.Deployment{{}},
+				mockedDeployments: []appsv1.Deployment{{
+					Status: appsv1.DeploymentStatus{
+						Replicas:      int32(1),
+						ReadyReplicas: int32(0),
+					},
+				}},
 				mockedExceededTime: false,
 			},
 			wantErr: false,

pkg/util/k8s_lookup.go

@@ -12,7 +12,7 @@ import (
 
 //go:generate mockgen -destination=k8s_lookup_mocks.go -package util -source k8s_lookup.go
 
-const MaxChecksWaitingForSpinnakerStability = 1
+const MaxChecksWaitingForSpinnakerStability = 2
 
 type Ik8sLookup interface {
 	GetSpinnakerDeployments(instance interfaces.SpinnakerService) ([]appsv1.Deployment, error)