Browse Source

Merge pull request #9051 from smarterclayton/admin

Certificates signed by admins should be approved
OpenShift Merge Robot 6 years ago
parent
commit
c6d9de19a3

+ 1 - 1
roles/openshift_bootstrap_autoapprover/files/openshift-bootstrap-controller.yaml

@@ -49,7 +49,7 @@ spec:
           username=\${4}
 
           # auto approve
-          if [[ -z "\${condition}" && ("\${username}" == "system:serviceaccount:openshift-infra:node-bootstrapper" || "\${username}" == "system:node:"* ) ]]; then
+          if [[ -z "\${condition}" && ("\${username}" == "system:serviceaccount:openshift-infra:node-bootstrapper" || "\${username}" == "system:node:"* || "\${username}" == "system:admin" ) ]]; then
             oc adm certificate approve "\${name}"
             exit 0
           fi