Merge pull request #17753 from deads2k/rebase-03-routermetrics

Automatic merge from submit-queue (batch tested with PRs 16281, 17293, 17717, 17753, 17830).

 re-enable router metrics test

fixes #17752

Add debugging for now

Author: openshift-merge-robot

pkg/router/metrics/metrics.go

@@ -98,14 +98,14 @@ func (l Listener) authorizeHandler(protected http.Handler) http.Handler {
 		}
 		scopedRecord.User = user
 		authorized, reason, err := l.Authorizer.Authorize(scopedRecord)
-		if authorized != authorizer.DecisionAllow || err != nil {
-			if !ok || errors.IsUnauthorized(err) {
-				glog.V(5).Infof("Unable to authorize: %v", err)
-				http.Error(w, fmt.Sprintf("Forbidden: %s", reason), http.StatusForbidden)
-			} else {
-				glog.V(3).Infof("Unable to authorize: %v", err)
-				http.Error(w, "Unable to authorize the user due to an error", http.StatusInternalServerError)
-			}
+		if err != nil {
+			glog.V(3).Infof("Unable to authorize: %v", err)
+			http.Error(w, "Unable to authorize the user due to an error", http.StatusInternalServerError)
+			return
+		}
+		if authorized != authorizer.DecisionAllow {
+			glog.V(5).Infof("Unable to authorize: %v", err)
+			http.Error(w, fmt.Sprintf("Forbidden: %s", reason), http.StatusForbidden)
 			return
 		}
 		protected.ServeHTTP(w, req)

test/extended/util/test.go

@@ -260,9 +260,6 @@ var (
 		// these broke in the rebase, but everything else is working
 		`should function for intra-pod communication`,
 		`should function for node-pod communication`,
-		// consistent 500 errors
-		"should expose prometheus metrics for a route",
-		"should expose the profiling endpoints",
 
 		`\[Skipped\]`,
 		`\[Slow\]`,