Propagate existing CNI_ARGS to non-k8s consumers, e.g., podman

Signed-off-by: Chan Shih-Ping <[email protected]>
cri-o · Feb 20, 2020 · 21dcfcd · 21dcfcd
1 parent d288157
commit 21dcfcd
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/pkg/ocicni/ocicni.go b/pkg/ocicni/ocicni.go
@@ -809,6 +809,13 @@ func buildCNIRuntimeConf(cacheDir string, podNetwork *PodNetwork, ifName string,
  CapabilityArgs: map[string]interface{}{},
  }
 
+ // Propagate existing CNI_ARGS to non-k8s consumers
+ for _, kvpairs := range strings.Split(os.Getenv("CNI_ARGS"), ";"){
+ if keyval := strings.Split(kvpairs, "="); len(keyval) == 2 {
+ rt.Args = append(rt.Args, [2]string{keyval[0], keyval[1]})
+ }
+ }
+
  // Add requested static IP to CNI_ARGS
  ip := runtimeConfig.IP
  if ip != "" {