network: pass pod UID to ocicni when performing network operations

This allows plugins to more correctly cancel long-running sandbox
operations when the pod is deleted/re-created in the Kube API
while the call is ongoing.

Signed-off-by: Dan Williams <dcbw@redhat.com>

server/sandbox_network.go

@@ -221,6 +221,7 @@ func (s *Server) newPodNetwork(sb *sandbox.Sandbox) (ocicni.PodNetwork, error) {
 	return ocicni.PodNetwork{
 		Name:      sb.KubeName(),
 		Namespace: sb.Namespace(),
+		UID:       sb.Metadata().UID,
 		Networks:  []ocicni.NetAttachment{},
 		ID:        sb.ID(),
 		NetNS:     sb.NetNsPath(),

test/cni_plugin_helper.bash

@@ -20,6 +20,8 @@ for arg in "${array[@]}"; do
         K8S_POD_NAMESPACE="${item[1]}"
     elif [[ "${item[0]}" == "K8S_POD_NAME" ]]; then
         K8S_POD_NAME="${item[1]}"
+    elif [[ "${item[0]}" == "K8S_POD_UID" ]]; then
+        K8S_POD_UID="${item[1]}"
     fi
 done
 
@@ -29,6 +31,8 @@ elif [[ -z "${K8S_POD_NAMESPACE}" ]]; then
     exit 1
 elif [[ -z "${K8S_POD_NAME}" ]]; then
     exit 1
+elif [[ -z "${K8S_POD_UID}" ]]; then
+    exit 1
 fi
 
 TEST_DIR=%TEST_DIR%
@@ -37,6 +41,7 @@ cat <<EOT >"$TEST_DIR/plugin_test_args.out"
 FOUND_CNI_CONTAINERID="${CNI_CONTAINERID}"
 FOUND_K8S_POD_NAMESPACE="${K8S_POD_NAMESPACE}"
 FOUND_K8S_POD_NAME="${K8S_POD_NAME}"
+FOUND_K8S_POD_UID="${K8S_POD_UID}"
 EOT
 
 # shellcheck disable=1090

test/network.bats

@@ -76,6 +76,7 @@ function teardown() {
 	[ "$FOUND_CNI_CONTAINERID" != "podsandbox1" ]
 	[ "$FOUND_K8S_POD_NAMESPACE" = "redhat.test.crio" ]
 	[ "$FOUND_K8S_POD_NAME" = "podsandbox1" ]
+	[ "$FOUND_K8S_POD_UID" = "redhat-test-crio" ]
 }
 
 @test "Connect to pod hostport from the host" {