Merge pull request #24950 from andyzheng0831/apiserver

GCI/Trusty: Support ABAC authorization
This commit is contained in:
Robert Bailey
2016-05-06 13:59:39 -07:00
2 changed files with 5 additions and 21 deletions

View File

@@ -910,6 +910,7 @@ function kube::release::package_kube_manifests_tarball() {
cp "${salt_dir}/etcd/etcd.manifest" "${dst_dir}"
cp "${salt_dir}/kube-scheduler/kube-scheduler.manifest" "${dst_dir}"
cp "${salt_dir}/kube-apiserver/kube-apiserver.manifest" "${dst_dir}"
cp "${salt_dir}/kube-apiserver/abac-authz-policy.jsonl" "${dst_dir}"
cp "${salt_dir}/kube-controller-manager/kube-controller-manager.manifest" "${dst_dir}"
cp "${salt_dir}/kube-addons/namespace.yaml" "${dst_dir}"
cp "${salt_dir}/kube-addons/kube-addons.sh" "${dst_dir}"