From 544cdbb21a2d6c4ad22b2cea5863d772aad9d454 Mon Sep 17 00:00:00 2001 From: fengxusong Date: Wed, 18 Sep 2019 11:42:03 +0800 Subject: [PATCH] Refactor switch statement in pkg/kube/wait.go Signed-off-by: fengxusong --- pkg/kube/wait.go | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go index 48ae4c1b5..dcc234a3b 100644 --- a/pkg/kube/wait.go +++ b/pkg/kube/wait.go @@ -64,46 +64,7 @@ func (w *waiter) waitForResources(created ResourceList) error { if err != nil || !w.isPodReady(pod) { return false, err } - case *appsv1.Deployment: - currentDeployment, err := w.c.AppsV1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{}) - if err != nil { - return false, err - } - // Find RS associated with deployment - newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, w.c.AppsV1()) - if err != nil || newReplicaSet == nil { - return false, err - } - if !w.deploymentReady(newReplicaSet, currentDeployment) { - return false, nil - } - case *appsv1beta1.Deployment: - currentDeployment, err := w.c.AppsV1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{}) - if err != nil { - return false, err - } - // Find RS associated with deployment - newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, w.c.AppsV1()) - if err != nil || newReplicaSet == nil { - return false, err - } - if !w.deploymentReady(newReplicaSet, currentDeployment) { - return false, nil - } - case *appsv1beta2.Deployment: - currentDeployment, err := w.c.AppsV1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{}) - if err != nil { - return false, err - } - // Find RS associated with deployment - newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, w.c.AppsV1()) - if err != nil || newReplicaSet == nil { - return false, err - } - if !w.deploymentReady(newReplicaSet, currentDeployment) { - return false, nil - } - case *extensionsv1beta1.Deployment: + case *appsv1.Deployment, *appsv1beta1.Deployment, *appsv1beta2.Deployment, *extensionsv1beta1.Deployment: currentDeployment, err := w.c.AppsV1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{}) if err != nil { return false, err