Skip to content

Commit

Permalink
Incorporate Casey's comments
Browse files Browse the repository at this point in the history
  • Loading branch information
s1061123 committed Jul 27, 2018
1 parent 3b3622d commit 5bd342c
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions plugins/ipam/static/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ type Net struct {
Name string `json:"name"`
CNIVersion string `json:"cniVersion"`
IPAM *IPAMConfig `json:"ipam"`
RuntimeConfig struct {
Addresses []Address `json:"addresses,omitempty"`
} `json:"runtimeConfig,omitempty"`
}

type IPAMConfig struct {
Expand Down Expand Up @@ -87,10 +84,6 @@ func LoadIPAMConfig(bytes []byte, envArgs string) (*IPAMConfig, string, error) {
return nil, "", fmt.Errorf("IPAM config missing 'ipam' key")
}

if len(n.RuntimeConfig.Addresses) != 0 {
n.IPAM.Addresses = append(n.RuntimeConfig.Addresses, n.IPAM.Addresses...)
}

// Validate all ranges
numV4 := 0
numV6 := 0
Expand Down

0 comments on commit 5bd342c

Please sign in to comment.