Skip to content

1.7.7, 1.7.8 Cherry picks #16722

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

Merged
openshift-merge-robot merged 11 commits into from
Oct 11, 2017
Merged

1.7.7, 1.7.8 Cherry picks #16722

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c20a371
UPSTREAM: 52823: Third party resources should not be part of conformance
soltysh Sep 21, 2017
993e6f3
UPSTREAM: 51199: Makes Hostname and Subdomain fields of v1.PodSpec se…
soltysh Aug 22, 2017
379148d
UPSTREAM: 52602: etcd3 store: retry w/live object on conflict
soltysh Oct 6, 2017
9b006c4
UPSTREAM: 52545: use specified discovery information if possible
soltysh Aug 2, 2017
7a029c0
UPSTREAM: 52775: Fix panic in ControllerManager when GCE external loa…
soltysh Sep 18, 2017
9fdb4ed
UPSTREAM: 52947: Preserve leading and trailing slashes on proxy subpaths
soltysh Sep 23, 2017
9f20f52
UPSTREAM: 53299: Correct APIGroup for RoleBindingBuilder Subjects
soltysh Oct 6, 2017
88592ac
UPSTREAM: 52604: Use separate client for node status loop
soltysh Sep 14, 2017
714d511
UPSTREAM: 53332: Ignore pods for quota that exceed deletion grace period
soltysh Oct 6, 2017
5d4c7f1
UPSTREAM: 53457: Ignore notFound when deleting firewall
soltysh Oct 4, 2017
c1f8eef
Origin changes after cherry-picks
soltysh Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/build/registry/buildconfig/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@soltysh soltysh Oct 10, 2017

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

@bparees bparees Oct 10, 2017

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

@liggitt liggitt Oct 10, 2017

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

@soltysh soltysh Oct 10, 2017

Choose a reason for hiding this comment

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

Yup, just that.

if len(parts) != 2 {
return errors.NewBadRequest(fmt.Sprintf("unexpected hook subpath %s", subpath))
}
Expand Down
3 changes: 2 additions & 1 deletion test/testdata/bootstrappolicy/bootstrap_namespace_role_bindings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ items:
kind: Role
name: shared-resource-viewer
subjects:
- kind: Group
- apiGroup: rbac.authorization.k8s.io
kind: Group
name: system:authenticated
kind: List
metadata: {}
3 changes: 2 additions & 1 deletion test/testdata/bootstrappolicy/bootstrap_service_account_project_role_bindings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ items:
kind: ClusterRole
name: system:image-puller
subjects:
- kind: Group
- apiGroup: rbac.authorization.k8s.io
kind: Group
name: system:serviceaccounts:myproject
- apiVersion: rbac.authorization.k8s.io/v1beta1
kind: RoleBinding
Expand Down