Origin changes after cherry-picks

openshift · Oct 10, 2017 · c1f8eef · c1f8eef
1 parent 5d4c7f1
commit c1f8eef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pkg/build/registry/buildconfig/webhook.go b/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, "/"), "/")
 	if len(parts) != 2 {
 		return errors.NewBadRequest(fmt.Sprintf("unexpected hook subpath %s", subpath))
 	}

diff --git a/test/testdata/bootstrappolicy/bootstrap_namespace_role_bindings.yaml b/test/testdata/bootstrappolicy/bootstrap_namespace_role_bindings.yaml
@@ -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: {}
diff --git a/test/testdata/bootstrappolicy/bootstrap_service_account_project_role_bindings.yaml b/test/testdata/bootstrappolicy/bootstrap_service_account_project_role_bindings.yaml
@@ -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