Skip to content

make the recycler pod template changeable #15958

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
Merged
merged 2 commits into from
Aug 26, 2017
Merged

make the recycler pod template changeable #15958

merged 2 commits into from
Aug 26, 2017

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Aug 24, 2017

Fixes #15812

@openshift-merge-robot openshift-merge-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 24, 2017
jsafrane
jsafrane reviewed Aug 24, 2017
View reviewed changes
pkg/cmd/server/kubernetes/master/controller/volumes.go Outdated
func newPersistentVolumeRecyclerPodTemplate(recyclerImageName string) func() *v1.Pod {
return func() *v1.Pod {
uid := int64(0)
defaultScrubPod := volume.NewPersistentVolumeRecyclerPodTemplate()
Copy link
Contributor

@jsafrane jsafrane Aug 24, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

wouldn't it recursively call newPersistentVolumeRecyclerPodTemplate() (the one that starts 3 lines above)? IMO you need proper closure:

func newPersistentVolumeRecyclerPodTemplate(...) {
    oldTemplateFunc := volume.NewPersistentVolumeRecyclerPodTemplate
    return func() *v1.Pod {
		uid := int64(0)
		defaultScrubPod := oldTemplateFunc()
...

I am curious of test results...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am curious of test results...

Heh, fully red.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@mfojtik
Copy link
Contributor

mfojtik commented Aug 24, 2017 •
edited
Loading

/test extended_conformance_install_update

flake: #15912

@jsafrane
Copy link
Contributor

/lgtm
/retest

flake: #15961

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue

@openshift-merge-robot openshift-merge-robot merged commit d8cb876 into openshift:master Aug 26, 2017
@deads2k deads2k deleted the controller-05-pv branch January 24, 2018 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsafrane jsafrane jsafrane left review comments

Assignees

@jsafrane jsafrane

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@deads2k @mfojtik @jsafrane @openshift-merge-robot @openshift-ci-robot