libcni: set both GC valid attachment keys

squeed · squeed · commit 692efbd2a775 · 2024-07-22T10:57:12.000-04:00
I made an (embarassing) error where SPEC.md and libcni disagreed on the
key for valid attachments for a GC operation. The spec has been
updated, but libcni should set both keys as a transition mechanism.

Signed-off-by: Casey Callendrello &lt;c1@caseyc.net&gt;
diff --git a/libcni/api.go b/libcni/api.go
@@ -817,6 +817,8 @@ func (c *CNIConfig) GCNetworkList(ctx context.Context, list *NetworkConfigList,
 		}
 		if args != nil {
 			inject["cni.dev/valid-attachments"] = args.ValidAttachments
+			// #1101: spec used incorrect variable name
+			inject["cni.dev/attachments"] = args.ValidAttachments
 		}
 
 		for _, plugin := range list.Plugins {

Original file line number	Diff line number	Diff line change
`@@ -817,6 +817,8 @@ func (c CNIConfig) GCNetworkList(ctx context.Context, list NetworkConfigList,`
`817`	`817`	`}`
`818`	`818`	`if args != nil {`
`819`	`819`	`inject["cni.dev/valid-attachments"] = args.ValidAttachments`
	`820`	`+ // #1101: spec used incorrect variable name`
	`821`	`+ inject["cni.dev/attachments"] = args.ValidAttachments`
`820`	`822`	`}`
`821`	`823`
`822`	`824`	`for _, plugin := range list.Plugins {`