Skip to content

Use int64 for NC version in NNC #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 5, 2020
Merged

Use int64 for NC version in NNC #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
153886c
update cns tag in yaml
thatmattlong Nov 3, 2020
fa1edfd
pipeline cleanup
Nov 3, 2020
364a8cd
Merge branch 'master' of https://github.com/Azure/azure-container-net…
thatmattlong Nov 5, 2020
fa943fa
Use int64 for NC version in NNC status
thatmattlong Nov 5, 2020
4d7878b
Merge branch 'master' of https://github.com/thatmattlong/azure-contai…
thatmattlong Nov 5, 2020
635c568
Merge branch 'master' of https://github.com/Azure/azure-container-net…
thatmattlong Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cns/requestcontroller/kubecontroller/crdrequestcontroller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ func TestInitRequestController(t *testing.T) {
},
},
SubnetAddressSpace: subnetRange,
Version: "1",
Version: 1,
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion cns/requestcontroller/kubecontroller/crdtranslator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func CRDStatusToNCRequest(crdStatus nnc.NodeNetworkConfigStatus) (cns.CreateNetw
ncRequest.SecondaryIPConfigs = make(map[string]cns.SecondaryIPConfig)
ncRequest.NetworkContainerid = nc.ID
ncRequest.NetworkContainerType = cns.Docker
ncRequest.Version = nc.Version
ncRequest.Version = strconv.FormatInt(nc.Version, 10)

if ip = net.ParseIP(nc.PrimaryIP); ip == nil {
return ncRequest, fmt.Errorf("Invalid PrimaryIP %s:", nc.PrimaryIP)
Expand Down
8 changes: 3 additions & 5 deletions cns/requestcontroller/kubecontroller/crdtranslator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package kubecontroller

import (
"strconv"
"testing"

"github.com/Azure/azure-container-networking/cns"
Expand All @@ -18,7 +17,7 @@ const (
subnetAddressSpace = "10.0.0.0/24"
subnetPrefixLen = 24
testSecIp1 = "10.0.0.2"
version = "1"
version = 1
)

func TestStatusToNCRequestMalformedPrimaryIP(t *testing.T) {
Expand Down Expand Up @@ -237,8 +236,7 @@ func TestStatusToNCRequestSuccess(t *testing.T) {
t.Fatalf("Expected %v as the secondary IP config but got %v", testSecIp1, secondaryIP.IPAddress)
}

ncVersionInInt, _ := strconv.Atoi(version)
if secondaryIP.NCVersion != ncVersionInInt {
t.Fatalf("Expected %d as the secondary IP config NC version but got %v", ncVersionInInt, secondaryIP.NCVersion)
if secondaryIP.NCVersion != version {
t.Fatalf("Expected %d as the secondary IP config NC version but got %v", version, secondaryIP.NCVersion)
}
}
2 changes: 1 addition & 1 deletion nodenetworkconfig/api/v1alpha/nodenetworkconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ type NetworkContainer struct {
IPAssignments []IPAssignment `json:"ipAssignments,omitempty"`
DefaultGateway string `json:"defaultGateway,omitempty"`
SubnetAddressSpace string `json:"subnetAddressSpace,omitempty"`
Version string `json:"version,omitempty"`
Version int64 `json:"version,omitempty"`
}

// IPAssignment groups an IP address and Name. Name is a UUID set by the the IP address assigner.
Expand Down
3 changes: 2 additions & 1 deletion nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ spec:
subnetName:
type: string
version:
type: string
format: int64
type: integer
type: object
type: array
scaler:
Expand Down