Merge pull request #16722 from soltysh/cherry-picks

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

1.7.7, 1.7.8 Cherry picks

Fixes #16361

Author: openshift-merge-robot

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))
 	}

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: {}

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