Repository: mesos Updated Branches: refs/heads/master 7c5e89ed7 -> 496ca3bf7
Added "TeardownFramework" to ACL protobuf. Review: https://reviews.apache.org/r/41930/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d0a5cd62 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d0a5cd62 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d0a5cd62 Branch: refs/heads/master Commit: d0a5cd623dfc56aac52e38c38aa7defec57e8e64 Parents: 7c5e89e Author: Guangya Liu <[email protected]> Authored: Thu Jan 21 01:25:03 2016 -0800 Committer: Adam B <[email protected]> Committed: Thu Jan 21 01:26:02 2016 -0800 ---------------------------------------------------------------------- include/mesos/authorizer/authorizer.proto | 15 +++++++++++++++ 1 file changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/d0a5cd62/include/mesos/authorizer/authorizer.proto ---------------------------------------------------------------------- diff --git a/include/mesos/authorizer/authorizer.proto b/include/mesos/authorizer/authorizer.proto index 84727e6..226441f 100644 --- a/include/mesos/authorizer/authorizer.proto +++ b/include/mesos/authorizer/authorizer.proto @@ -59,6 +59,8 @@ message ACL { // Which principals are authorized to shutdown frameworks of other // principals. + // TODO(gyliu513): Remove this message at the end of the deprecation + // cycle on 0.27. It will be replaced by TeardownFramework then. message ShutdownFramework { // Subjects. required Entity principals = 1; @@ -67,6 +69,16 @@ message ACL { required Entity framework_principals = 2; } + // Which principals are authorized to teardown frameworks of other + // principals. + message TeardownFramework { + // Subjects. + required Entity principals = 1; + + // Objects. + required Entity framework_principals = 2; + } + // Specifies which Resources a principal can reserve. message ReserveResources { // Subjects: Framework principal or Operator username. @@ -151,6 +163,8 @@ message ACLs { optional bool permissive = 1 [default = true]; repeated ACL.RegisterFramework register_frameworks = 2; repeated ACL.RunTask run_tasks = 3; + // TODO(gyliu513): Remove this shutdown_frameworks at the + // end of the deprecation cycle on 0.27. repeated ACL.ShutdownFramework shutdown_frameworks = 4; repeated ACL.ReserveResources reserve_resources = 5; repeated ACL.UnreserveResources unreserve_resources = 6; @@ -158,4 +172,5 @@ message ACLs { repeated ACL.DestroyVolume destroy_volumes = 8; repeated ACL.SetQuota set_quotas = 9; repeated ACL.RemoveQuota remove_quotas = 10; + repeated ACL.TeardownFramework teardown_frameworks = 11; }
