diff --git a/bindata/manifests/cni-config/sriov-cni-config.yaml b/bindata/manifests/cni-config/sriov-cni-config.yaml index 6e917e528..749e326c7 100644 --- a/bindata/manifests/cni-config/sriov-cni-config.yaml +++ b/bindata/manifests/cni-config/sriov-cni-config.yaml @@ -7,7 +7,7 @@ metadata: k8s.v1.cni.cncf.io/resourceName: {{.SriovCniResourceName}} spec: config: '{ - "cniVersion":"0.3.1", + "cniVersion":"1.0.0", "name":"{{.SriovNetworkName}}", {{- if .MetaPluginsConfigured -}} "plugins": [ diff --git a/controllers/sriovibnetwork_controller_test.go b/controllers/sriovibnetwork_controller_test.go index 9b2aef84e..badb11d97 100644 --- a/controllers/sriovibnetwork_controller_test.go +++ b/controllers/sriovibnetwork_controller_test.go @@ -285,7 +285,7 @@ func generateExpectedIBNetConfig(cr *sriovnetworkv1.SriovIBNetwork) string { if cr.Spec.IPAM != "" { ipam = cr.Spec.IPAM } - configStr, err := formatJSON(fmt.Sprintf(`{ "cniVersion":"0.3.1", "name":"%s","type":"ib-sriov",%s"ipam":%s }`, cr.GetName(), state, ipam)) + configStr, err := formatJSON(fmt.Sprintf(`{ "cniVersion":"1.0.0", "name":"%s","type":"ib-sriov",%s"ipam":%s }`, cr.GetName(), state, ipam)) if err != nil { panic(err) } diff --git a/controllers/sriovnetwork_controller_test.go b/controllers/sriovnetwork_controller_test.go index 356b7d3cd..2eceb2133 100644 --- a/controllers/sriovnetwork_controller_test.go +++ b/controllers/sriovnetwork_controller_test.go @@ -355,7 +355,7 @@ func generateExpectedNetConfig(cr *sriovnetworkv1.SriovNetwork) string { } configStr, err := formatJSON(fmt.Sprintf( - `{ "cniVersion":"0.3.1", "name":"%s","type":"sriov","vlan":%d,%s%s"vlanQoS":%d,%s%s%s%s"ipam":%s }`, + `{ "cniVersion":"1.0.0", "name":"%s","type":"sriov","vlan":%d,%s%s"vlanQoS":%d,%s%s%s%s"ipam":%s }`, cr.GetName(), cr.Spec.Vlan, spoofchk, trust, vlanQoS, vlanProto, state, logLevel, logFile, ipam)) if err != nil { panic(err)