Skip to content

deploymentconfig: drop unnecessary conversions in tests #25318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jul 25, 2020
Merged

deploymentconfig: drop unnecessary conversions in tests #25318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions test/extended/controller_manager/deploy_scale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 1 addition & 6 deletions test/extended/deployments/deployments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down