Skip to content

K
k3s
Commit 95badd95 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #41190 from php-coder/minor_capabilities_comment_fixes

Automatic merge from submit-queue Minor comments improvements Fix typo and wrong comment.
parents beaf5ffa 1320f47f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
pkg/security/podsecuritypolicy/capabilities/mustrunas.go
View file @ 95badd95
...@@ -87,7 +87,7 @@ func (s *defaultCapabilities) Validate(pod *api.Pod, container *api.Container) f ...@@ -87,7 +87,7 @@ func (s *defaultCapabilities) Validate(pod *api.Pod, container *api.Container) f
} }
if container.SecurityContext.Capabilities == nil { 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 // 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. // then we can safely return here without further validation.
if len(s.defaultAddCapabilities) == 0 && len(s.requiredDropCapabilities) == 0 { if len(s.defaultAddCapabilities) == 0 && len(s.requiredDropCapabilities) == 0 {
...@@ -138,8 +138,7 @@ func capabilityFromStringSlice(slice []string) []api.Capability { ...@@ -138,8 +138,7 @@ func capabilityFromStringSlice(slice []string) []api.Capability {
return caps return caps
} }
// makeCapSet makes a string set from capabilities and normalizes them to be all lower case to help // makeCapSet makes a string set from capabilities.
// with comparisons.
func makeCapSet(caps []api.Capability) sets.String { func makeCapSet(caps []api.Capability) sets.String {
s := sets.NewString() s := sets.NewString()
for _, c := range caps { for _, c := range caps {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment