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.

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

Jump to bottom

Rename pkg/deploy -> pkg/apps #16202

Merged
merged 1 commit into from
Sep 8, 2017
Merged

Rename pkg/deploy -> pkg/apps #16202

merged 1 commit into from
Sep 8, 2017

Conversation

soltysh
Copy link
Contributor

@soltysh soltysh commented Sep 7, 2017

@deads2k @mfojtik like promised
@tnozicka fyi

@openshift-ci-robot openshift-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Sep 7, 2017
@deads2k
Copy link
Contributor

deads2k commented Sep 7, 2017

/lgtm

@soltysh not sure what order you want commits to merge, feel free to bump this one up the queue if you want it before your others.

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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 openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 7, 2017
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2017
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 7, 2017
@soltysh soltysh added the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2017
@soltysh
Copy link
Contributor Author

soltysh commented Sep 7, 2017

Updated the missing bits from make verify.

@soltysh
Copy link
Contributor Author

soltysh commented Sep 7, 2017

Rebased.

@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2017
@soltysh soltysh added the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2017
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2017
@soltysh soltysh added the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2017
mfojtik
mfojtik reviewed Sep 7, 2017
View reviewed changes
pkg/api/install/install.go
@@ -37,19 +37,19 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
watchapi "k8s.io/apimachinery/pkg/watch"

deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
Copy link
Contributor

Choose a reason for hiding this comment

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

appsapi

mfojtik
mfojtik reviewed Sep 7, 2017
View reviewed changes
pkg/api/install/install.go
imageapi "github.com/openshift/origin/pkg/image/apis/image"
oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
projectapi "github.com/openshift/origin/pkg/project/apis/project"
routeapi "github.com/openshift/origin/pkg/route/apis/route"
templateapi "github.com/openshift/origin/pkg/template/apis/template"
userapi "github.com/openshift/origin/pkg/user/apis/user"

deployv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
Copy link
Contributor

Choose a reason for hiding this comment

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

appsv1

mfojtik
mfojtik reviewed Sep 7, 2017
View reviewed changes
pkg/api/kubegraph/analysis/hpa.go
@@ -15,8 +15,8 @@ import (
"github.com/openshift/origin/pkg/api/kubegraph"
kubeedges "github.com/openshift/origin/pkg/api/kubegraph"
kubenodes "github.com/openshift/origin/pkg/api/kubegraph/nodes"
deploygraph "github.com/openshift/origin/pkg/deploy/graph"
deploynodes "github.com/openshift/origin/pkg/deploy/graph/nodes"
deploygraph "github.com/openshift/origin/pkg/apps/graph"
Copy link
Contributor

Choose a reason for hiding this comment

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

appsgraph

mfojtik
mfojtik reviewed Sep 7, 2017
View reviewed changes
pkg/api/kubegraph/analysis/hpa_test.go
@@ -7,7 +7,7 @@ import (
osgraph "github.com/openshift/origin/pkg/api/graph"
osgraphtest "github.com/openshift/origin/pkg/api/graph/test"
"github.com/openshift/origin/pkg/api/kubegraph"
deploygraph "github.com/openshift/origin/pkg/deploy/graph"
deploygraph "github.com/openshift/origin/pkg/apps/graph"
Copy link
Contributor

Choose a reason for hiding this comment

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

appsgraph

mfojtik
mfojtik reviewed Sep 7, 2017
View reviewed changes
pkg/api/kubegraph/edge_test.go
deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
_ "github.com/openshift/origin/pkg/deploy/apis/apps/install"
deploygraph "github.com/openshift/origin/pkg/deploy/graph/nodes"
deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

mfojtik
mfojtik reviewed Sep 7, 2017
View reviewed changes
pkg/api/kubegraph/edges.go
@@ -14,8 +14,8 @@ import (

osgraph "github.com/openshift/origin/pkg/api/graph"
kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
deploygraph "github.com/openshift/origin/pkg/deploy/graph/nodes"
deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
Copy link
Contributor

Choose a reason for hiding this comment

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

and here

@mfojtik
Copy link
Contributor

mfojtik commented Sep 7, 2017 •
edited
Loading

@soltysh mind creating issue to rename the named imports ? s/deployapi/appsapi/ && friends

still lgtm, don't want to block this

@soltysh
Copy link
Contributor Author

soltysh commented Sep 7, 2017

I'll do a followup, it's much more work with the rename you're asking for and I wanted to have the basic part in, already.

@soltysh
Copy link
Contributor Author

soltysh commented Sep 7, 2017

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue

@openshift-merge-robot openshift-merge-robot merged commit 9b053a4 into openshift:master Sep 8, 2017
@soltysh soltysh deleted the rename_deploy branch September 11, 2017 08:45
@soltysh soltysh mentioned this pull request Sep 11, 2017
Merged
openshift-merge-robot added a commit that referenced this pull request Dec 15, 2017
@openshift-merge-robot
Merge pull request #16281 from soltysh/rename_imports
12d2744 
Automatic merge from submit-queue.

Rename deploy.* imports to apps.*

Followup to #16202.

@mfojtik ptal, since you asked for it :)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mfojtik mfojtik mfojtik left review comments

Assignees

@mfojtik mfojtik

@deads2k deads2k

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. needs-api-review queue/multiple-rebases size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@soltysh @deads2k @openshift-merge-robot @mfojtik @openshift-bot @openshift-ci-robot