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 #33417 from yifan-gu/fix_cap_panic

Browse Source 
Automatic merge from submit-queue

Fix an 'index out of range' panic when setting capabilities.

cc @yujuhong @feiskyer
This commit is contained in:
Kubernetes Submit Queue 2016-09-25 20:12:41 -07:00 committed by GitHub
commit 437b55bfd5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kuberuntime/kuberuntime_container.go
View File

@ -210,8 +210,8 @@ func (m *kubeGenericRuntimeManager) generateLinuxContainerConfig(container *api.
securityContext := container.SecurityContext securityContext := container.SecurityContext
if securityContext.Capabilities != nil { if securityContext.Capabilities != nil {
linuxConfig.Capabilities = &runtimeApi.Capability{ linuxConfig.Capabilities = &runtimeApi.Capability{
AddCapabilities: make([]string, 0, len(securityContext.Capabilities.Add)), AddCapabilities: make([]string, len(securityContext.Capabilities.Add)),
DropCapabilities: make([]string, 0, len(securityContext.Capabilities.Drop)), DropCapabilities: make([]string, len(securityContext.Capabilities.Drop)),
} }
for index, value := range securityContext.Capabilities.Add { for index, value := range securityContext.Capabilities.Add {
linuxConfig.Capabilities.AddCapabilities[index] = string(value) linuxConfig.Capabilities.AddCapabilities[index] = string(value)