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

Refactor pkg/kubelet/config/file_test.go #5705

Merged
merged 2 commits into from
Mar 20, 2015

Conversation

wojtek-t
Copy link
Member

Please do NOT merge until #5704 is merged.

This is a followup from #5704
Also - this PR is built on top of #5704, thus only the last commit is unique (and should be reviewed).

@vmarmol @yujuhong

@wojtek-t wojtek-t force-pushed the refactor_file_test branch from f7bbe21 to 3c6105b Compare March 20, 2015 12:37
@vmarmol vmarmol self-assigned this Mar 20, 2015
@vmarmol
Copy link
Contributor

vmarmol commented Mar 20, 2015

Can rebase now that #5704 is in :)

@wojtek-t wojtek-t force-pushed the refactor_file_test branch from 3c6105b to 5d51318 Compare March 20, 2015 17:17
@wojtek-t
Copy link
Member Author

Rebased.

Namespace: kubelet.NamespaceDefault,
SelfLink: "/api/v1beta2/pods/12345-" + hostname + "?namespace=default",
},
Spec: api.PodSpec{Containers: []api.Container{{Image: "test/image"}}},
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't these have the container name and imagePullPolicy? I'm a bit confused the tests pass. We do include these in http_test.go

Copy link
Member Author

Choose a reason for hiding this comment

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

As you noted below - it's because DeepDerivative.

@vmarmol
Copy link
Contributor

vmarmol commented Mar 20, 2015

Looks good overall, just some questions.

@yujuhong
Copy link
Contributor

LGTM

@wojtek-t wojtek-t force-pushed the refactor_file_test branch from 5d51318 to 9c4ef28 Compare March 20, 2015 19:13
@wojtek-t
Copy link
Member Author

PTAL

@vmarmol
Copy link
Contributor

vmarmol commented Mar 20, 2015

LGTM, thanks @wojtek-t!

vmarmol added a commit that referenced this pull request Mar 20, 2015
Refactor pkg/kubelet/config/file_test.go
@vmarmol vmarmol merged commit 5cfe0c0 into kubernetes:master Mar 20, 2015
@wojtek-t wojtek-t deleted the refactor_file_test branch March 27, 2015 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants