Skip to content

feat: include subnet address space in CRD #647

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 1 commit into from
Aug 13, 2020
Merged

feat: include subnet address space in CRD #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions cns/requestcontroller/kubecontroller/crdtranslator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const (
ipNotCIDR = "10.0.0.1"
ipMalformed = "10.0.0.0.0"
defaultGateway = "10.0.0.2"
subnetID = "subnet1"
subnetName = "subnet1"
)

func TestStatusToNCRequestMalformedPrimaryIP(t *testing.T) {
Expand Down Expand Up @@ -155,9 +155,9 @@ func TestStatusToNCRequestSuccess(t *testing.T) {
IP: ipCIDR,
},
},
SubnetID: subnetID,
DefaultGateway: defaultGateway,
Netmask: "", // Not currently set by DNC Request Controller
SubnetName: subnetName,
DefaultGateway: defaultGateway,
SubnetAddressSpace: "", // Not currently set by DNC Request Controller
},
},
}
Expand Down
13 changes: 6 additions & 7 deletions nodenetworkconfig/api/v1alpha/nodenetworkconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,12 @@ type Scaler struct {

// NetworkContainer defines the structure of a Network Container as found in NetworkConfigStatus
type NetworkContainer struct {
ID string `json:"id,omitempty"`
PrimaryIP string `json:"primaryIP,omitempty"`
SubnetID string `json:"subnetID,omitempty"`
IPAssignments []IPAssignment `json:"iPAssignments,omitempty"`
DefaultGateway string `json:"defaultGateway,omitempty"`
// Netmask for the subnet represented by this NC's SubnetID
Netmask string `json:"netmask,omitempty"`
ID string `json:"id,omitempty"`
PrimaryIP string `json:"primaryIP,omitempty"`
SubnetName string `json:"subnetName,omitempty"`
IPAssignments []IPAssignment `json:"iPAssignments,omitempty"`
DefaultGateway string `json:"defaultGateway,omitempty"`
SubnetAddressSpace string `json:"subnetAddressSpace,omitempty"`
}

// IPAssignment groups an IP address and Name. Name is a UUID set by the the IP address assigner.
Expand Down
7 changes: 3 additions & 4 deletions nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,11 @@ spec:
type: array
id:
type: string
netmask:
description: Netmask for the subnet represented by this NC's SubnetID
type: string
primaryIP:
type: string
subnetID:
subnetAddressSpace:
type: string
subnetName:
type: string
type: object
type: array
Expand Down