From e3a8b807ac4e3e4fc084a0c84d69910709ccc139 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Sat, 27 Jan 2018 11:49:15 +0100 Subject: [PATCH] add appsv1beta1 and appsv1beta2 apiVersion (cherry picked from commit 2cee4c68fa77e8c149b639be4f1502ffaad74bf9) --- pkg/kube/wait.go | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go index d4bc1e7e1..5bbc4fce6 100644 --- a/pkg/kube/wait.go +++ b/pkg/kube/wait.go @@ -88,6 +88,36 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error { currentDeployment, } deployments = append(deployments, newDeployment) + case *appsv1beta1.Deployment: + currentDeployment, err := kcs.ExtensionsV1beta1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{}) + if err != nil { + return false, err + } + // Find RS associated with deployment + newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, kcs.ExtensionsV1beta1()) + if err != nil || newReplicaSet == nil { + return false, err + } + newDeployment := deployment{ + newReplicaSet, + currentDeployment, + } + deployments = append(deployments, newDeployment) + case *appsv1beta2.Deployment: + currentDeployment, err := kcs.ExtensionsV1beta1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{}) + if err != nil { + return false, err + } + // Find RS associated with deployment + newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, kcs.ExtensionsV1beta1()) + if err != nil || newReplicaSet == nil { + return false, err + } + newDeployment := deployment{ + newReplicaSet, + currentDeployment, + } + deployments = append(deployments, newDeployment) case *extensions.Deployment: currentDeployment, err := kcs.ExtensionsV1beta1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{}) if err != nil {