Skip to content
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.

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

remove deploymentconfig registry #15858

Merged
merged 1 commit into from
Aug 26, 2017

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Aug 18, 2017

Remove more registry dependencies from "easy" resources.

@openshift-merge-robot openshift-merge-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 18, 2017
@openshift-merge-robot openshift-merge-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 18, 2017
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 19, 2017
@deads2k
Copy link
Contributor Author

deads2k commented Aug 20, 2017

/retest

2 similar comments
@deads2k
Copy link
Contributor Author

deads2k commented Aug 20, 2017

/retest

@deads2k
Copy link
Contributor Author

deads2k commented Aug 22, 2017

/retest

@deads2k
Copy link
Contributor Author

deads2k commented Aug 23, 2017

/retest

if err != nil {
return nil, err
}

return deployapi.ScaleFromConfig(deploymentConfig), nil
return deployapi.ScaleFromConfig(deploymentConfig.(*deployapi.DeploymentConfig)), nil
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i guess we don't need to check this assertion?

if err != nil {
return nil, false, errors.NewNotFound(extensions.Resource("scale"), name)
}
deploymentConfig := uncastObj.(*deployapi.DeploymentConfig)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check?

It would be programmer error. I don't feel too bad about panic-ing here.

@@ -30,7 +30,7 @@ import (
"github.com/openshift/origin/pkg/build/webhook/github"
"github.com/openshift/origin/pkg/build/webhook/gitlab"
deployapiv1 "github.com/openshift/origin/pkg/deploy/apis/apps/v1"
deployconfigregistry "github.com/openshift/origin/pkg/deploy/registry/deployconfig"
oappsclient "github.com/openshift/origin/pkg/deploy/generated/internalclientset"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: why not appsclient?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: why not appsclient?

collides with upstream

return nil, err
}
deployRollbackClient := deployrollback.Client{
GRFn: deployrollback.NewRollbackGenerator().GenerateRollback,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnozicka @Kargakis reminds me you wanted to get rid of rollback generator, right?

@@ -1,135 +0,0 @@
package etcd
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@deads2k for clarification, we don't need this test anymore or it moves elsewhere or we already test this in different place?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@deads2k for clarification, we don't need this test anymore or it moves elsewhere or we already test this in different place?

We don't need it because its just re-running the generic etcd storage testing.

@ironcladlou
Copy link
Contributor

Looks like you snuck some route and template registry removal in here too, you sly dog

@ironcladlou
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 24, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, ironcladlou

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@deads2k
Copy link
Contributor Author

deads2k commented Aug 25, 2017

/retest

@aerialls
Copy link

The failed test does not seem to be related to my change No package matching 'atomic-openshift-docker-excluder-3.6.173.0.5*' found available, installed or updated.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 15942, 15940, 15957, 15858, 15946)

@openshift-merge-robot openshift-merge-robot merged commit 01635f3 into openshift:master Aug 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants