Merge pull request containerd#5643 from dcbw/15-cni-plugin-pod-uid

estesp · web-flow · commit 9b71425980cd · 2021-06-23T15:39:38.000-04:00
[release/1.5] sandbox: send pod UID to CNI plugins as K8S_POD_UID
diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go
@@ -409,6 +409,7 @@ func toCNILabels(id string, config *runtime.PodSandboxConfig) map[string]string
 		"K8S_POD_NAMESPACE":          config.GetMetadata().GetNamespace(),
 		"K8S_POD_NAME":               config.GetMetadata().GetName(),
 		"K8S_POD_INFRA_CONTAINER_ID": id,
+		"K8S_POD_UID":                config.GetMetadata().GetUid(),
 		"IgnoreUnknown":              "1",
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,7 @@ func toCNILabels(id string, config *runtime.PodSandboxConfig) map[string]string`
`409`	`409`	`"K8S_POD_NAMESPACE": config.GetMetadata().GetNamespace(),`
`410`	`410`	`"K8S_POD_NAME": config.GetMetadata().GetName(),`
`411`	`411`	`"K8S_POD_INFRA_CONTAINER_ID": id,`
	`412`	`+ "K8S_POD_UID": config.GetMetadata().GetUid(),`
`412`	`413`	`"IgnoreUnknown": "1",`
`413`	`414`	`}`
`414`	`415`	`}`