github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

dockershim: support filter containers by sandbox ID

Browse Source
This commit is contained in:
Yu-Ju Hong
2016-09-15 17:31:51 -07:00
parent 2f60b72dd3
commit 73f30b18e4
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubelet/dockershim/helpers.go
View File

@@ -84,11 +84,20 @@ func extractLabels(input map[string]string) (map[string]string, map[string]strin
annotations := make(map[string]string)
for k, v := range input {
// Check if the key is used internally by the shim.
// TODO: containerTypeLabelKey is the only internal label the shim uses
// right now. Expand this to a list later.
if k == containerTypeLabelKey {
internal := false
for _, internalKey := range internalLabelKeys {
// TODO: containerTypeLabelKey is the only internal label the shim uses
// right now. Expand this to a list later.
if k == internalKey {
internal = true
break
}
}
if internal {
continue
}
// Check if the label should be treated as an annotation.
if strings.HasPrefix(k, annotationPrefix) {
annotations[strings.TrimPrefix(k, annotationPrefix)] = v
continue