Skip to content

Commit

Permalink
Merge pull request kubernetes#54703 from php-coder/psp_update_examples
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 54533, 54777, 54763, 54806, 54703). 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>.

examples/podsecuritypolicy/rbac: fix names in comments and sync with examples repository

**What this PR does / why we need it**:
This PR fixes policies, roles, and bindings names in the comments. Also it sync examples with the examples from https://github.com/kubernetes/examples/tree/master/staging/podsecuritypolicy/rbac 

**Release note**:
```release-note
NONE
```

CC @simo5
  • Loading branch information
Kubernetes Submit Queue authored Oct 31, 2017
2 parents 1d59476 + 1f0c5e1 commit d0c4c56
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
10 changes: 5 additions & 5 deletions examples/podsecuritypolicy/rbac/bindings.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# privilegedPSP gives the privilegedPSP role
# to the group privileged.
# privileged-psp-users gives the privileged-psp-user role
# to the group privileged-psp-users.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -13,8 +13,8 @@ roleRef:
kind: ClusterRole
name: privileged-psp-user
---
# restrictedPSP grants the restrictedPSP role to
# the groups restricted and privileged.
# restricted-psp-users grants the restricted-psp-user role to
# the groups restricted-psp-users and privileged-psp-users.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -32,7 +32,7 @@ roleRef:
name: restricted-psp-user
---
# edit grants edit role to the groups
# restricted and privileged.
# restricted-psp-users and privileged-psp-users.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand Down
10 changes: 9 additions & 1 deletion examples/podsecuritypolicy/rbac/policies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ spec:
- '*'
allowedCapabilities:
- '*'
hostPID: true
hostIPC: true
hostNetwork: true
hostPorts:
- min: 1
max: 65536
---
apiVersion: extensions/v1beta1
kind: PodSecurityPolicy
Expand All @@ -38,4 +44,6 @@ spec:
- 'configMap'
- 'persistentVolumeClaim'
- 'projected'

hostPID: false
hostIPC: false
hostNetwork: false
10 changes: 4 additions & 6 deletions examples/podsecuritypolicy/rbac/roles.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# restrictedPSP grants access to use
# the restricted PSP.
# restricted-psp-user grants access to use the restricted PSP.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: restricted-psp-user
rules:
rules:
- apiGroups:
- extensions
resources:
Expand All @@ -14,13 +13,12 @@ rules:
verbs:
- use
---
# privilegedPSP grants access to use the privileged
# PSP.
# privileged-psp-user grants access to use the privileged PSP.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: privileged-psp-user
rules:
rules:
- apiGroups:
- extensions
resources:
Expand Down

0 comments on commit d0c4c56

Please sign in to comment.