Merge pull request #5026 from crosbymichael/cni-anno

mikebrow · web-flow · commit e288feacf35b · 2021-02-10T09:21:58.000-06:00
[cri] add pod annotations to CNI call
diff --git a/pkg/cri/annotations/annotations.go b/pkg/cri/annotations/annotations.go
@@ -53,6 +53,10 @@ const (
 
 	// ContainerName is the name of the container in the pod
 	ContainerName = "io.kubernetes.cri.container-name"
+
 	// ImageName is the name of the image used to create the container
 	ImageName = "io.kubernetes.cri.image-name"
+
+	// PodAnnotations are the annotations of the pod
+	PodAnnotations = "io.kubernetes.cri.pod-annotations"
 )
diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go
@@ -370,6 +370,7 @@ func (c *criService) setupPodNetwork(ctx context.Context, sandbox *sandboxstore.
 func cniNamespaceOpts(id string, config *runtime.PodSandboxConfig) ([]cni.NamespaceOpts, error) {
 	opts := []cni.NamespaceOpts{
 		cni.WithLabels(toCNILabels(id, config)),
+		cni.WithCapability(annotations.PodAnnotations, config.Annotations),
 	}
 
 	portMappings := toCNIPortMappings(config.GetPortMappings())

Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,7 @@ func (c criService) setupPodNetwork(ctx context.Context, sandbox sandboxstore.`
`370`	`370`	`func cniNamespaceOpts(id string, config *runtime.PodSandboxConfig) ([]cni.NamespaceOpts, error) {`
`371`	`371`	`opts := []cni.NamespaceOpts{`
`372`	`372`	`cni.WithLabels(toCNILabels(id, config)),`
	`373`	`+ cni.WithCapability(annotations.PodAnnotations, config.Annotations),`
`373`	`374`	`}`
`374`	`375`
`375`	`376`	`portMappings := toCNIPortMappings(config.GetPortMappings())`