Merge pull request #741 from abhinavdahiya/remove_all_approve

operator: remove the cluster role binding that auto approves all node client CSRs
openshift · May 16, 2019 · fcf5aa0 · fcf5aa0
2 parents 99d419d + 30231ff
commit fcf5aa0
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 57 deletions.
diff --git a/manifests/machineconfigserver/csr-approver-role-binding.yaml b/manifests/machineconfigserver/csr-approver-role-binding.yaml
diff --git a/pkg/operator/assets/bindata.go b/pkg/operator/assets/bindata.go
diff --git a/pkg/operator/bootstrap.go b/pkg/operator/bootstrap.go
@@ -127,9 +127,6 @@ func RenderBootstrap(
 	}, {
 		data:     filesData[pullSecretFile],
 		filename: "bootstrap/manifests/machineconfigcontroller-pull-secret",
-	}, {
-		name:     "manifests/machineconfigserver/csr-approver-role-binding.yaml",
-		filename: "manifests/csr-approver-role-binding.yaml",
 	}, {
 		name:     "manifests/machineconfigserver/csr-bootstrap-role-binding.yaml",
 		filename: "manifests/csr-bootstrap-role-binding.yaml",

diff --git a/pkg/operator/sync.go b/pkg/operator/sync.go
@@ -253,7 +253,6 @@ func (optr *Operator) syncMachineConfigServer(config renderConfig) error {
 
 	crbs := []string{
 		"manifests/machineconfigserver/clusterrolebinding.yaml",
-		"manifests/machineconfigserver/csr-approver-role-binding.yaml",
 		"manifests/machineconfigserver/csr-bootstrap-role-binding.yaml",
 		"manifests/machineconfigserver/csr-renewal-role-binding.yaml",
 	}