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

Make the fake command factory return the clientset with appropriate rest clients for all the API groups. #35866

Merged
merged 2 commits into from
Nov 4, 2016
Merged

Make the fake command factory return the clientset with appropriate rest clients for all the API groups. #35866

merged 2 commits into from
Nov 4, 2016

Conversation

madhusudancs
Copy link
Contributor

@madhusudancs madhusudancs commented Oct 30, 2016 •
edited by pwittrock
Loading

Please review only the last commit here. This is based on PR #35865 which will be reviewed independently.

Design Doc: PR #34484

cc @kubernetes/sig-cluster-federation @nikhiljindal

This change is Reviewable

@madhusudancs madhusudancs added area/cluster-federation release-note-none Denotes a PR that doesn't merit a release note. labels Oct 30, 2016
@madhusudancs madhusudancs added this to the v1.5 milestone Oct 30, 2016
@madhusudancs madhusudancs assigned ghost Oct 30, 2016
@madhusudancs madhusudancs mentioned this pull request Oct 30, 2016
Merged
@k8s-github-robot k8s-github-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 30, 2016
@madhusudancs madhusudancs assigned janetkuo and unassigned ghost Nov 1, 2016
janetkuo
janetkuo reviewed Nov 1, 2016
View reviewed changes
pkg/kubectl/cmd/testing/fake.go
clientset.RbacClient.RESTClient.Client = fakeClient.Client
clientset.StorageClient.RESTClient.Client = fakeClient.Client
clientset.AppsClient.RESTClient.Client = fakeClient.Client
clientset.PolicyClient.RESTClient.Client = fakeClient.Client
Copy link
Member

Choose a reason for hiding this comment

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

DiscoveryClient wasn't covered. Is it intentional?

Copy link
Member

Choose a reason for hiding this comment

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

If one adds more clients in Clientset, how do we make sure one swap the fake REST client here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@janetkuo

DiscoveryClient wasn't covered. Is it intentional?

Oops. That wasn't intentional. Copy-paste fail. Added it now.

If one adds more clients in Clientset, how do we make sure one swap the fake REST client here?

Unfortunately, yes.

Copy link
Member

Choose a reason for hiding this comment

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

I think you'll need to rebase because RESTClient isn't there anymore :'(

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@janetkuo yeah. This entire chain of PRs need a rebase because of that. I will take care of the rebases, please ignore it for now.

Copy link
Member

Choose a reason for hiding this comment

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

This LGTM then.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@janetkuo thanks!

@k8s-ci-robot
Copy link
Contributor

Jenkins verification failed for commit 68de01d409ff6cb61f50486d60dfa6de85522172. Full PR test history.

The magic incantation to run this job again is @k8s-bot verify test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit 68de01d409ff6cb61f50486d60dfa6de85522172. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GKE smoke e2e failed for commit 68de01d409ff6cb61f50486d60dfa6de85522172. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE Node e2e failed for commit 68de01d409ff6cb61f50486d60dfa6de85522172. Full PR test history.

The magic incantation to run this job again is @k8s-bot node e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins Kubemark GCE e2e failed for commit 68de01d409ff6cb61f50486d60dfa6de85522172. Full PR test history.

The magic incantation to run this job again is @k8s-bot kubemark e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GCE e2e failed for commit 68de01d409ff6cb61f50486d60dfa6de85522172. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gce e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE e2e failed for commit 68de01d409ff6cb61f50486d60dfa6de85522172. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gce e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE etcd3 e2e failed for commit 68de01d409ff6cb61f50486d60dfa6de85522172. Full PR test history.

The magic incantation to run this job again is @k8s-bot gce etcd3 e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@madhusudancs
Make the fake command factory return the clientset with appropriate r…
e69475d 
…est clients for all the API groups.

Calling `internalclientset.New()` with a rest client as an argument simply
copies that rest client to all the API group clients irrespective of the
configured GroupVersion or versionedAPIPath in the client. So only one
API group client gets the client configured correctly for that API
group. All the other API group clients get misconfigured rest clients.

On the other hand, `internalclientset.NewForConfigOrDie()` does the right
thing by reconfiguring the passed configs for each API group and
initializes an appropriate rest client for that group.

Now that we are relying on the `NewForConfigOrDie()` method to
initialize the rest clients, we need to swap the underlying http clients
in each of these rest clients with a fake one for testing.
@madhusudancs madhusudancs force-pushed the federation-kubefed-init-fakeclient branch from 68de01d to e69475d Compare November 2, 2016 02:03
@madhusudancs
Copy link
Contributor Author

Rebased the PR and squashed the commits. Adding LGTM label.

@madhusudancs madhusudancs added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 2, 2016
@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 2, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins unit/integration failed for commit e69475d. Full PR test history.

The magic incantation to run this job again is @k8s-bot unit test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 2, 2016
@janetkuo janetkuo added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 3, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 9531442 into kubernetes:master Nov 4, 2016
@madhusudancs madhusudancs deleted the federation-kubefed-init-fakeclient branch November 4, 2016 17:30
@mengqiy mengqiy mentioned this pull request Nov 4, 2016
Merged
@madhusudancs madhusudancs mentioned this pull request Nov 17, 2016
Closed
22 tasks
@mengqiy mengqiy mentioned this pull request Dec 7, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janetkuo janetkuo janetkuo left review comments

Assignees

@janetkuo janetkuo

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@madhusudancs @k8s-ci-robot @k8s-github-robot @janetkuo @googlebot