Merge pull request #55419 from rramkumar1/patch-1

Automatic merge from submit-queue (batch tested with PRs 55268, 55282, 55419, 48340, 54829). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix typo in rbac setup in configure-helper.sh

Fixed a typo which was causing script to break while creating a GKE cluster.

Specifically, the line  "setup-addon-manifests 'addons' 'rbac/legacy-kubelet-user-disabled' " was meant to refer to the directory cluster/addons/rbac/legacy-kubelet-user-disable. The extra "d" at the end of "disable" was causing the script to break.

Original PR: #53144

Release Note:
```release-note
None
```
This commit is contained in:
Kubernetes Submit Queue 2017-11-09 21:39:26 -08:00 committed by GitHub
commit 760974f28f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1779,7 +1779,7 @@ function start-kube-addons {
if [[ "${REGISTER_MASTER_KUBELET:-false}" == "true" ]]; then
setup-addon-manifests "addons" "rbac/legacy-kubelet-user"
else
setup-addon-manifests "addons" "rbac/legacy-kubelet-user-disabled"
setup-addon-manifests "addons" "rbac/legacy-kubelet-user-disable"
fi
if [[ "${ENABLE_POD_SECURITY_POLICY:-}" == "true" ]]; then