Merge pull request kubernetes#12469 from xiejunan/auth_example

change "ns" to "namespace" in example and doc for ABAC authorization
penland365 · Aug 10, 2015 · 08f67e5 · 08f67e5
2 parents d3b8dbe + 8d99ba9
commit 08f67e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/admin/authorization.md b/docs/admin/authorization.md
@@ -111,7 +111,7 @@ To permit an action Policy with an unset namespace applies regardless of namespa
  1. Alice can do anything: `{"user":"alice"}`
  2. Kubelet can read any pods: `{"user":"kubelet", "resource": "pods", "readonly": true}`
  3. Kubelet can read and write events: `{"user":"kubelet", "resource": "events"}`
- 4. Bob can just read pods in namespace "projectCaribou": `{"user":"bob", "resource": "pods", "readonly": true, "ns": "projectCaribou"}`
+ 4. Bob can just read pods in namespace "projectCaribou": `{"user":"bob", "resource": "pods", "readonly": true, "namespace": "projectCaribou"}`
 
 [Complete file example](http://releases.k8s.io/HEAD/pkg/auth/authorizer/abac/example_policy_file.jsonl)
 

diff --git a/pkg/auth/authorizer/abac/example_policy_file.jsonl b/pkg/auth/authorizer/abac/example_policy_file.jsonl
@@ -5,5 +5,5 @@
 {"user":"kubelet",  "readonly": true, "resource": "services"}
 {"user":"kubelet",  "readonly": true, "resource": "endpoints"}
 {"user":"kubelet", "resource": "events"}
-{"user":"alice", "ns": "projectCaribou"}
-{"user":"bob", "readonly": true, "ns": "projectCaribou"}
+{"user":"alice", "namespace": "projectCaribou"}
+{"user":"bob", "readonly": true, "namespace": "projectCaribou"}