github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5026 from crosbymichael/cni-anno

Browse Source 
[cri] add pod annotations to CNI call
This commit is contained in:
Mike Brown 2021-02-10 09:21:58 -06:00 committed by GitHub
commit e288feacf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cri/annotations/annotations.go
View File

@ -53,6 +53,10 @@ const (
// ContainerName is the name of the container in the pod // ContainerName is the name of the container in the pod
ContainerName = "io.kubernetes.cri.container-name" ContainerName = "io.kubernetes.cri.container-name"
// ImageName is the name of the image used to create the container // ImageName is the name of the image used to create the container
ImageName = "io.kubernetes.cri.image-name" ImageName = "io.kubernetes.cri.image-name"
// PodAnnotations are the annotations of the pod
PodAnnotations = "io.kubernetes.cri.pod-annotations"
) )

1
pkg/cri/server/sandbox_run.go
View File

@ -370,6 +370,7 @@ func (c *criService) setupPodNetwork(ctx context.Context, sandbox *sandboxstore.
func cniNamespaceOpts(id string, config *runtime.PodSandboxConfig) ([]cni.NamespaceOpts, error) { func cniNamespaceOpts(id string, config *runtime.PodSandboxConfig) ([]cni.NamespaceOpts, error) {
opts := []cni.NamespaceOpts{ opts := []cni.NamespaceOpts{
cni.WithLabels(toCNILabels(id, config)), cni.WithLabels(toCNILabels(id, config)),
cni.WithCapability(annotations.PodAnnotations, config.Annotations),
} }
portMappings := toCNIPortMappings(config.GetPortMappings()) portMappings := toCNIPortMappings(config.GetPortMappings())