github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41190 from php-coder/minor_capabilities_comment_fixes

Browse Source 
Automatic merge from submit-queue

Minor comments improvements

Fix typo and wrong comment.
This commit is contained in:
Kubernetes Submit Queue 2017-02-13 09:57:13 -08:00 committed by GitHub
commit 95badd95ce
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/security/podsecuritypolicy/capabilities/mustrunas.go
View File

@ -87,7 +87,7 @@ func (s *defaultCapabilities) Validate(pod *api.Pod, container *api.Container) f
}
if container.SecurityContext.Capabilities == nil {
// if container.SC.Caps is nil then nothing was defaulted by the strat or requested by the pod author
// if container.SC.Caps is nil then nothing was defaulted by the strategy or requested by the pod author
// if there are no required caps on the strategy and nothing is requested on the pod
// then we can safely return here without further validation.
if len(s.defaultAddCapabilities) == 0 && len(s.requiredDropCapabilities) == 0 {
@ -138,8 +138,7 @@ func capabilityFromStringSlice(slice []string) []api.Capability {
return caps
}
// makeCapSet makes a string set from capabilities and normalizes them to be all lower case to help
// with comparisons.
// makeCapSet makes a string set from capabilities.
func makeCapSet(caps []api.Capability) sets.String {
s := sets.NewString()
for _, c := range caps {