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

UPSTREAM: 37228: kubelet: storage: teardown terminated pod volumes #12669

Merged
merged 2 commits into from
Jan 28, 2017

Conversation

sjenning
Copy link
Contributor

@sjenning sjenning force-pushed the pick-37228 branch 2 times, most recently from 135d0f3 to 66d5600 Compare January 25, 2017 22:12
@sjenning
Copy link
Contributor Author

[test] while waiting for review

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 26, 2017

continuous-integration/openshift-jenkins/test Waiting: Determining build queue position

@@ -473,6 +473,9 @@ type KubeletConfiguration struct {
// (binaries, etc.) to mount the volume are available on the underlying node. If the check is enabled
// and fails the mount operation fails.
ExperimentalCheckNodeCapabilitiesBeforeMount bool `json:"ExperimentalCheckNodeCapabilitiesBeforeMount,omitempty"`
// This flag, if set, instructs the kubelet to keep volumes from terminated pods mounted to the node.
// This can be useful for debugging volume related issues.
KeepTerminatedPodVolumes bool `json:"KeepTerminatedPodVolumes,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

The upstream PR doesn't have json tags but this does?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok I see the others in this file do as well (upstream has since cleared them from internal). Nevermind on this for now.

@@ -511,6 +511,9 @@ type KubeletConfiguration struct {
// (binaries, etc.) to mount the volume are available on the underlying node. If the check is enabled
// and fails the mount operation fails.
ExperimentalCheckNodeCapabilitiesBeforeMount bool `json:"ExperimentalCheckNodeCapabilitiesBeforeMount,omitempty"`
// This flag, if set, instructs the kubelet to keep volumes from terminated pods mounted to the node.
// This can be useful for debugging volume related issues.
KeepTerminatedPodVolumes bool `json:"KeepTerminatedPodVolumes,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

json tag should start with a lowercase k

@ncdc
Copy link
Contributor

ncdc commented Jan 26, 2017

2 comments to address then lgtm

@ncdc
Copy link
Contributor

ncdc commented Jan 26, 2017

@liggitt @smarterclayton ptal, the json tags are a bit funky as kube upstream has removed internal json tags and also fixed the capitalization issue in componentconfig. Are you ok merging this as is?

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 4dab27c

@smarterclayton
Copy link
Contributor

I want to run this against GCE first.

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13352/) (Base Commit: 3e38a69)

@ncdc
Copy link
Contributor

ncdc commented Jan 27, 2017

GCE test will be here once the previous build wraps up: https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_gce/200

@smarterclayton
Copy link
Contributor

@ncdc
Copy link
Contributor

ncdc commented Jan 27, 2017

@smarterclayton any objections to merging?

@smarterclayton
Copy link
Contributor

no, merge away.

@ncdc
Copy link
Contributor

ncdc commented Jan 27, 2017 via email

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 4dab27c

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 27, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13390/) (Base Commit: ae7e34f) (Image: devenv-rhel7_5798)

@openshift-bot openshift-bot merged commit 7eb072f into openshift:master Jan 28, 2017
@derekwaynecarr
Copy link
Member

@sjenning - we need to ensure that upstream does not change this flag between now and release of k8s 1.6. also we will need updates to the documentation for out of resource handling to ensure that operators know about this flag...

@sjenning sjenning deleted the pick-37228 branch August 16, 2017 02:21
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.

5 participants