Skip to content

Commit

Permalink
Merge pull request #665 from SchSeba/bump_cni_version
Browse files Browse the repository at this point in the history
bump CNI version for the sriov-cni
  • Loading branch information
SchSeba authored Apr 24, 2024
2 parents e741850 + ace40a0 commit c5d4773
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bindata/manifests/cni-config/sriov-cni-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion controllers/sriovibnetwork_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/sriovnetwork_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c5d4773

Please sign in to comment.