Merge pull request containerd#10921 from aojea/nri_network

expose Pod assigned IPs to NRI plugins
austinvazquez · Nov 7, 2024 · 1d6fdda · 1d6fdda
2 parents 5bfa36a + bc056a5
commit 1d6fdda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/internal/cri/nri/nri_api_linux.go b/internal/cri/nri/nri_api_linux.go
@@ -633,6 +633,14 @@ func (p *criPodSandbox) GetPid() uint32 {
 	return p.pid
 }
 
+func (p *criPodSandbox) GetIPs() []string {
+	if p.IP == "" {
+		return nil
+	}
+	ips := append([]string{p.IP}, p.AdditionalIPs...)
+	return ips
+}
+
 //
 // NRI integration wrapper for CRI Containers
 //

diff --git a/internal/nri/sandbox.go b/internal/nri/sandbox.go
@@ -34,6 +34,7 @@ type PodSandbox interface {
 	GetLinuxPodSandbox() LinuxPodSandbox
 
 	GetPid() uint32
+	GetIPs() []string
 }
 
 type LinuxPodSandbox interface {
@@ -55,6 +56,7 @@ func commonPodSandboxToNRI(pod PodSandbox) *nri.PodSandbox {
 		Annotations:    pod.GetAnnotations(),
 		RuntimeHandler: pod.GetRuntimeHandler(),
 		Pid:            pod.GetPid(),
+		Ips:            pod.GetIPs(),
 	}
 }