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

1.7.7, 1.7.8 Cherry picks #16722

Merged
merged 11 commits into from
Oct 11, 2017
Merged

1.7.7, 1.7.8 Cherry picks #16722

merged 11 commits into from
Oct 11, 2017

Conversation

soltysh
Copy link
Contributor

@soltysh soltysh commented Oct 6, 2017

Fixes #16361

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 6, 2017
@soltysh soltysh added the kind/bug Categorizes issue or PR as related to a bug. label Oct 6, 2017
@soltysh
Copy link
Contributor Author

soltysh commented Oct 6, 2017

@ironcladlou fyi

@soltysh
Copy link
Contributor Author

soltysh commented Oct 6, 2017

/retest

@liggitt liggitt changed the title 1.7.X Cherry picks 1.7.7, 1.7.8 Cherry picks Oct 7, 2017
@liggitt
Copy link
Contributor

liggitt commented Oct 7, 2017

picks look fine, tests need looking into.

unit test is legitimate:

In suite "github.com/openshift/origin/pkg/cmd/server/bootstrappolicy", test case "TestGetBootstrapNamespaceRoleBindings" failed:
=== RUN   TestGetBootstrapNamespaceRoleBindings
--- FAIL: TestGetBootstrapNamespaceRoleBindings (0.02s)
	policy_test.go:124: Bootstrap policy data does not match the test fixture in ../../../../test/testdata/bootstrappolicy/bootstrap_namespace_role_bindings.yaml
	policy_test.go:135: Diff between bootstrap data and fixture data in ../../../../test/testdata/bootstrappolicy/bootstrap_namespace_role_bindings.yaml:

couln't actually spot the failed integration test

@soltysh
UPSTREAM: 52823: Third party resources should not be part of conformance
c20a371 
They are alpha and were sunset and replaced by CRD.
@soltysh
UPSTREAM: 51199: Makes Hostname and Subdomain fields of v1.PodSpec se…
993e6f3 
…ttable when empty and updates the StatefulSet controller to set them when empty
@liggitt
Copy link
Contributor

liggitt commented Oct 9, 2017

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, soltysh

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 openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 9, 2017
@liggitt liggitt mentioned this pull request Oct 10, 2017
Closed
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 10, 2017
@soltysh
Copy link
Contributor Author

soltysh commented Oct 10, 2017

Added missing import, I'll apply the labels back when tests will be green.

@soltysh
Copy link
Contributor Author

soltysh commented Oct 10, 2017 •
edited
Loading

flake #16716

@soltysh
Copy link
Contributor Author

soltysh commented Oct 10, 2017

/retest

soltysh
soltysh commented Oct 10, 2017
View reviewed changes
pkg/build/registry/buildconfig/webhook.go
@@ -94,7 +94,7 @@ func (h *WebHookHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {

// ProcessWebHook does the actual work of processing the webhook request
func (w *WebHookHandler) ProcessWebHook(writer http.ResponseWriter, req *http.Request, ctx apirequest.Context, name, subpath string) error {
parts := strings.Split(subpath, "/")
parts := strings.Split(strings.TrimPrefix(subpath, "/"), "/")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bparees fyi

Copy link
Contributor

Choose a reason for hiding this comment

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

@soltysh thanks.... k8s changed something about how the provide the request path to us??

Copy link
Contributor

Choose a reason for hiding this comment

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

Subresource path was stripping leading/trailing slashes incorrectly. Fixed in 1.7.8

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup, just that.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 10, 2017 •
edited
Loading

@soltysh: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/experimental/integration da5f663 link /test origin-it

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@soltysh
Copy link
Contributor Author

soltysh commented Oct 10, 2017

/retest

@soltysh
Copy link
Contributor Author

soltysh commented Oct 11, 2017

Applying the lgtm label on green tests.

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

Automatic merge from submit-queue (batch tested with PRs 16600, 16722, 16760, 16784).

@openshift-merge-robot openshift-merge-robot merged commit 498cba9 into openshift:master Oct 11, 2017
@soltysh soltysh deleted the cherry-picks branch October 12, 2017 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bparees bparees bparees left review comments

@liggitt liggitt liggitt left review comments

Assignees

@liggitt liggitt

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@soltysh @liggitt @openshift-merge-robot @openshift-bot @openshift-ci-robot @bparees