Merge pull request #22730 from enj/enj/i/remove_healthz_star

openshift-merge-robot · web-flow · commit 5519c78b0a34 · 2019-05-02T08:23:16.000+02:00
Remove /healthz/* from bootstrap RBAC
diff --git a/pkg/cmd/server/bootstrappolicy/policy.go b/pkg/cmd/server/bootstrappolicy/policy.go
@@ -436,7 +436,7 @@ func GetOpenshiftBootstrapClusterRoles() []rbacv1.ClusterRole {
 			},
 			Rules: []rbacv1.PolicyRule{
 				// Health
-				rbacv1helpers.NewRule("get").URLs("/healthz", "/healthz/*").RuleOrDie(),
+				rbacv1helpers.NewRule("get").URLs("/healthz", "/healthz/").RuleOrDie(),
 				authorizationapi.DiscoveryRule,
 			},
 		},
diff --git a/test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml b/test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml
@@ -1313,7 +1313,7 @@ items:
   rules:
   - nonResourceURLs:
     - /healthz
-    - /healthz/*
+    - /healthz/
     verbs:
     - get
   - nonResourceURLs:
diff --git a/test/testdata/bootstrappolicy/bootstrap_policy_file.yaml b/test/testdata/bootstrappolicy/bootstrap_policy_file.yaml
@@ -1313,7 +1313,7 @@ items:
   rules:
   - nonResourceURLs:
     - /healthz
-    - /healthz/*
+    - /healthz/
     verbs:
     - get
   - nonResourceURLs:
