Skip to content

Commit 727f8df

Browse files
authored
Always use 0 for NC version in Overlay (#1979)
always use 0 for NC version in overlay Signed-off-by: Evan Baker <[email protected]>
1 parent 20a3fc2 commit 727f8df

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

cns/kubecontroller/nodenetworkconfig/conversion.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ func CreateNCRequestFromDynamicNC(nc v1alpha.NetworkContainer) (*cns.CreateNetwo
7373
//
7474
//nolint:gocritic //ignore hugeparam
7575
func CreateNCRequestFromStaticNC(nc v1alpha.NetworkContainer) (*cns.CreateNetworkContainerRequest, error) {
76+
nc.Version = 0 // fix for NMA always giving us version 0 for Overlay NCs
7677
primaryPrefix, err := netip.ParsePrefix(nc.PrimaryIP)
7778
if err != nil {
7879
return nil, errors.Wrapf(err, "IP: %s", nc.PrimaryIP)

cns/kubecontroller/nodenetworkconfig/conversion_linux_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
var validOverlayRequest = &cns.CreateNetworkContainerRequest{
10-
Version: strconv.FormatInt(version, 10),
10+
Version: strconv.FormatInt(0, 10),
1111
IPConfiguration: cns.IPConfiguration{
1212
IPSubnet: cns.IPSubnet{
1313
PrefixLength: uint8(subnetPrefixLen),
@@ -19,19 +19,19 @@ var validOverlayRequest = &cns.CreateNetworkContainerRequest{
1919
SecondaryIPConfigs: map[string]cns.SecondaryIPConfig{
2020
"10.0.0.0": {
2121
IPAddress: "10.0.0.0",
22-
NCVersion: version,
22+
NCVersion: 0,
2323
},
2424
"10.0.0.1": {
2525
IPAddress: "10.0.0.1",
26-
NCVersion: version,
26+
NCVersion: 0,
2727
},
2828
"10.0.0.2": {
2929
IPAddress: "10.0.0.2",
30-
NCVersion: version,
30+
NCVersion: 0,
3131
},
3232
"10.0.0.3": {
3333
IPAddress: "10.0.0.3",
34-
NCVersion: version,
34+
NCVersion: 0,
3535
},
3636
},
3737
}

cns/kubecontroller/nodenetworkconfig/conversion_windows_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
var validOverlayRequest = &cns.CreateNetworkContainerRequest{
10-
Version: strconv.FormatInt(version, 10),
10+
Version: strconv.FormatInt(0, 10),
1111
IPConfiguration: cns.IPConfiguration{
1212
IPSubnet: cns.IPSubnet{
1313
PrefixLength: uint8(subnetPrefixLen),

0 commit comments

Comments
 (0)