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: 17886: pod log location must validate container if provided #6113

Merged
merged 2 commits into from Nov 29, 2015

Conversation

fabianofranz
Copy link
Member

@fabianofranz
Copy link
Member Author

Upstream PR: kubernetes/kubernetes#17886

@ncdc not sure if it's you, but ptal (here and upstream).

@@ -235,6 +235,7 @@ func LogLocation(getter ResourceGetter, connInfo client.ConnectionInfoGetter, ct
}

// Try to figure out a container
// If a container were provided, it must be valid
Copy link
Contributor

Choose a reason for hiding this comment

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

s/were/was/

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@fabianofranz fabianofranz force-pushed the bugs_1286094 branch 2 times, most recently from 3f707bc to 4356c0b Compare November 27, 2015 18:33
@fabianofranz
Copy link
Member Author

[test]

@liggitt liggitt self-assigned this Nov 27, 2015
@fabianofranz fabianofranz force-pushed the bugs_1286094 branch 2 times, most recently from 8ee8552 to 61d00fb Compare November 27, 2015 20:30
@liggitt
Copy link
Contributor

liggitt commented Nov 28, 2015

--- FAIL: TestRegistryResourceLocation (0.00s)
    rest_test.go:73: Status: Complete Expected Location: https://foo-host:12345/containerLogs/default/running-build/foo-container, Got https://foo-host:12345/containerLogs/default/foo-pod/foo-container
    rest_test.go:73: Status: Failed Expected Location: https://foo-host:12345/containerLogs/default/running-build/foo-container, Got https://foo-host:12345/containerLogs/default/foo-pod/foo-container
    rest_test.go:73: Status: Running Expected Location: https://foo-host:12345/containerLogs/default/running-build/foo-container, Got https://foo-host:12345/containerLogs/default/foo-pod/foo-container

@fabianofranz
Copy link
Member Author

@liggitt Seems just the mock, since we are now using the actual name from the rest api object, the mocks have to honour it. Fixed, let's see how it goes.

@liggitt
Copy link
Contributor

liggitt commented Nov 28, 2015

Yup, split origin changes into their own commit

@fabianofranz
Copy link
Member Author

@liggitt of course, missed that. Amending. Done.

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 9158aa1

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7527/)

@smarterclayton
Copy link
Contributor

I will cut 1.1.0.1 with this once merged.

@liggitt
Copy link
Contributor

liggitt commented Nov 29, 2015

Lgtm, [merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/4177/) (Image: devenv-rhel7_2827)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 9158aa1

openshift-bot pushed a commit that referenced this pull request Nov 29, 2015
@openshift-bot openshift-bot merged commit 4b1afe5 into openshift:master Nov 29, 2015
@sdodson
Copy link
Member

sdodson commented Dec 1, 2015

I will cut 1.1.0.1 with this once merged.

@smarterclayton This still happening?

@liggitt
Copy link
Contributor

liggitt commented Dec 1, 2015

Should also pick up #6129

@smarterclayton
Copy link
Contributor

Once Jordan tells me to

On Dec 1, 2015, at 10:50 AM, Jordan Liggitt notifications@github.com
wrote:

Should also pick up #6129 #6129


Reply to this email directly or view it on GitHub
#6113 (comment).

@liggitt
Copy link
Contributor

liggitt commented Dec 1, 2015

@smarterclayton go ahead (either from master or from ba7f510)

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.

None yet

5 participants