Merge pull request #109 from dcbw/check-uses-wrong-version

dcbw · web-flow · commit 028c71b44a21 · 2022-06-08T12:23:41.000-05:00
ocicni: fix checkNetwork() to use the right Result version for uncached results
diff --git a/pkg/ocicni/ocicni.go b/pkg/ocicni/ocicni.go
@@ -773,7 +773,7 @@ func (network *cniNetwork) checkNetwork(ctx context.Context, rt *libcni.RuntimeC
 	}
 
 	result = &cniv1.Result{
-		CNIVersion: network.config.CNIVersion,
+		CNIVersion: cniv1.ImplementedSpecVersion,
 		Interfaces: []*cniv1.Interface{cniInterface},
 		IPs:        ips,
 	}

Original file line number	Diff line number	Diff line change
`@@ -773,7 +773,7 @@ func (network cniNetwork) checkNetwork(ctx context.Context, rt libcni.RuntimeC`
`773`	`773`	`}`
`774`	`774`
`775`	`775`	`result = &cniv1.Result{`
`776`		`- CNIVersion: network.config.CNIVersion,`
	`776`	`+ CNIVersion: cniv1.ImplementedSpecVersion,`
`777`	`777`	`Interfaces: []*cniv1.Interface{cniInterface},`
`778`	`778`	`IPs: ips,`
`779`	`779`	`}`