From 9c7c6e01aca788e5b016da6af98f45315467277d Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Fri, 24 Jul 2020 14:03:20 +0200 Subject: [PATCH] deploymentconfig: drop unnecessary conversions in tests --- test/extended/controller_manager/deploy_scale.go | 7 +------ test/extended/deployments/deployments.go | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/test/extended/controller_manager/deploy_scale.go b/test/extended/controller_manager/deploy_scale.go index 6385e37496b6..c131023944f4 100644 --- a/test/extended/controller_manager/deploy_scale.go +++ b/test/extended/controller_manager/deploy_scale.go @@ -12,7 +12,6 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/restmapper" "k8s.io/client-go/scale" - "k8s.io/kubernetes/pkg/api/legacyscheme" g "github.com/onsi/ginkgo" "github.com/openshift/api/apps" @@ -71,11 +70,7 @@ var _ = g.Describe("[sig-apps][Feature:OpenShiftControllerManager]", func() { if err != nil { return false, nil } - externalConfig := &appsv1.DeploymentConfig{} - if err := legacyscheme.Scheme.Convert(config, externalConfig, nil); err != nil { - panic(err) - } - return appsutil.HasSynced(externalConfig, generation), nil + return appsutil.HasSynced(config, generation), nil } if err := wait.PollImmediate(500*time.Millisecond, 10*time.Second, condition); err != nil { t.Fatalf("Deployment config never synced: %v", err) diff --git a/test/extended/deployments/deployments.go b/test/extended/deployments/deployments.go index 572a24ded6ae..647fcc162aeb 100644 --- a/test/extended/deployments/deployments.go +++ b/test/extended/deployments/deployments.go @@ -22,7 +22,6 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" watchtools "k8s.io/client-go/tools/watch" - "k8s.io/kubernetes/pkg/api/legacyscheme" e2e "k8s.io/kubernetes/test/e2e/framework" appsv1 "github.com/openshift/api/apps/v1" @@ -1001,13 +1000,9 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun return false, nil } - externalDeploymentConfig := &appsv1.DeploymentConfig{} - if err := legacyscheme.Scheme.Convert(deploymentConfig, externalDeploymentConfig, nil); err != nil { - return false, err - } // we need to filter out any deployments that we don't care about, // namely the active deployment and any newer deployments - oldDeployments := appsutil.DeploymentsForCleanup(externalDeploymentConfig, deployments) + oldDeployments := appsutil.DeploymentsForCleanup(deploymentConfig, deployments) // we should not have more deployments than acceptable if len(oldDeployments) != revisionHistoryLimit {