From 8a927fae392d369b0cbb6f0726cd6b9d20d08a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=87=8E=20=E7=9B=B4=E4=BA=BA?= Date: Thu, 25 Nov 2021 09:44:49 +0900 Subject: [PATCH 1/5] Refactor state.go --- pkg/app/piped/cloudprovider/kubernetes/state.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/app/piped/cloudprovider/kubernetes/state.go b/pkg/app/piped/cloudprovider/kubernetes/state.go index ca0b37fa25..cad731bd25 100644 --- a/pkg/app/piped/cloudprovider/kubernetes/state.go +++ b/pkg/app/piped/cloudprovider/kubernetes/state.go @@ -351,9 +351,11 @@ func determineJobHealth(obj *unstructured.Unstructured) (status model.Kubernetes failed = true completed = true message = condition.Message + break case batchv1.JobComplete: completed = true message = condition.Message + break } } @@ -450,7 +452,6 @@ func determineIngressHealth(obj *unstructured.Unstructured) (status model.Kubern status = model.KubernetesResourceState_OTHER desc = fmt.Sprintf("Unexpected error while calculating: unable to convert %T to neither %T, %T, nor %T: %v", obj, v1Ingress, betaIngress, extensionIngress, err) return - } func determineServiceHealth(obj *unstructured.Unstructured) (status model.KubernetesResourceState_HealthStatus, desc string) { @@ -469,7 +470,6 @@ func determineServiceHealth(obj *unstructured.Unstructured) (status model.Kubern if len(s.Status.LoadBalancer.Ingress) == 0 { status = model.KubernetesResourceState_OTHER desc = "Ingress points for the load-balancer are in progress" - return } return } @@ -499,12 +499,11 @@ func determinePersistentVolumeHealth(obj *unstructured.Unstructured) (status mod case corev1.VolumeBound, corev1.VolumeAvailable: status = model.KubernetesResourceState_HEALTHY desc = pv.Status.Message - return default: status = model.KubernetesResourceState_OTHER desc = pv.Status.Message - return } + return } func determinePVCHealth(obj *unstructured.Unstructured) (status model.KubernetesResourceState_HealthStatus, desc string) { From eb0420d94f52ec950885a8a994d3099e434e0165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=87=8E=20=E7=9B=B4=E4=BA=BA?= Date: Thu, 25 Nov 2021 11:01:07 +0900 Subject: [PATCH 2/5] Remove break --- pkg/app/piped/cloudprovider/kubernetes/state.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/app/piped/cloudprovider/kubernetes/state.go b/pkg/app/piped/cloudprovider/kubernetes/state.go index cad731bd25..9b0fa67399 100644 --- a/pkg/app/piped/cloudprovider/kubernetes/state.go +++ b/pkg/app/piped/cloudprovider/kubernetes/state.go @@ -355,7 +355,6 @@ func determineJobHealth(obj *unstructured.Unstructured) (status model.Kubernetes case batchv1.JobComplete: completed = true message = condition.Message - break } } From 7d41450377159f8fd5ead737890dd874e45b0808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=87=8E=20=E7=9B=B4=E4=BA=BA?= Date: Thu, 25 Nov 2021 12:07:04 +0900 Subject: [PATCH 3/5] fix --- pkg/app/piped/cloudprovider/kubernetes/state.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/app/piped/cloudprovider/kubernetes/state.go b/pkg/app/piped/cloudprovider/kubernetes/state.go index 9b0fa67399..59eff4f1f0 100644 --- a/pkg/app/piped/cloudprovider/kubernetes/state.go +++ b/pkg/app/piped/cloudprovider/kubernetes/state.go @@ -356,6 +356,9 @@ func determineJobHealth(obj *unstructured.Unstructured) (status model.Kubernetes completed = true message = condition.Message } + if failed { + break + } } switch { From 8442fa9ee2322c452b87d1e96fa809ea82d32983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=87=8E=20=E7=9B=B4=E4=BA=BA?= Date: Thu, 25 Nov 2021 12:07:57 +0900 Subject: [PATCH 4/5] fix --- pkg/app/piped/cloudprovider/kubernetes/state.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/app/piped/cloudprovider/kubernetes/state.go b/pkg/app/piped/cloudprovider/kubernetes/state.go index 59eff4f1f0..63fec36003 100644 --- a/pkg/app/piped/cloudprovider/kubernetes/state.go +++ b/pkg/app/piped/cloudprovider/kubernetes/state.go @@ -472,6 +472,7 @@ func determineServiceHealth(obj *unstructured.Unstructured) (status model.Kubern if len(s.Status.LoadBalancer.Ingress) == 0 { status = model.KubernetesResourceState_OTHER desc = "Ingress points for the load-balancer are in progress" + return } return } From bb725fce5d8e11e106b441ead719533f727f3a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=87=8E=20=E7=9B=B4=E4=BA=BA?= Date: Thu, 25 Nov 2021 12:09:00 +0900 Subject: [PATCH 5/5] fix --- pkg/app/piped/cloudprovider/kubernetes/state.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/app/piped/cloudprovider/kubernetes/state.go b/pkg/app/piped/cloudprovider/kubernetes/state.go index 63fec36003..3ddd7bf2fc 100644 --- a/pkg/app/piped/cloudprovider/kubernetes/state.go +++ b/pkg/app/piped/cloudprovider/kubernetes/state.go @@ -351,7 +351,6 @@ func determineJobHealth(obj *unstructured.Unstructured) (status model.Kubernetes failed = true completed = true message = condition.Message - break case batchv1.JobComplete: completed = true message = condition.Message