Skip to content

Commit

Permalink
spec: remove 'version' from Result addresses
Browse files Browse the repository at this point in the history
Redundant and easily determined from the address itself.

Signed-off-by: Dan Williams <dcbw@redhat.com>
  • Loading branch information
dcbw committed Nov 18, 2020
1 parent 6823eba commit 840c8f6
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions SPEC.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

## Version

This is CNI **spec** version **0.4.0**.
This is CNI **spec** version **1.0.0 pre-release** and is still under active development.

Note that this is **independent from the version of the CNI library and plugins** in this repository (e.g. the versions of [releases](https://github.com/containernetworking/cni/releases)).

Expand Down Expand Up @@ -676,7 +676,6 @@ Success must be indicated by a zero return code and the following JSON being pri
"cniVersion": "0.4.0",
"ips": [
{
"version": "<4-or-6>",
"address": "<ip-and-prefix-in-CIDR>",
"gateway": "<ip-address-of-the-gateway>" (optional)
},
Expand Down Expand Up @@ -728,7 +727,6 @@ IPAM plugin examples:
```
"ips": [
{
"version": "<4-or-6>",
"address": "<ip-and-prefix-in-CIDR>",
"gateway": "<ip-address-of-the-gateway>", (optional)
"interface": <numeric index into 'interfaces' list> (not required for IPAM plugins)
Expand All @@ -740,8 +738,6 @@ IPAM plugin examples:
The `ips` field is a list of IP configuration information determined by the plugin. Each item is a dictionary describing of IP configuration for a network interface.
IP configuration for multiple network interfaces and multiple IP configurations for a single interface may be returned as separate items in the `ips` list.
All properties known to the plugin should be provided, even if not strictly required.
- `version` (string): either "4" or "6" and corresponds to the IP version of the addresses in the entry.
All IP addresses and gateways provided must be valid for the given `version`.
- `address` (string): an IP address in CIDR notation (eg "192.168.1.3/24").
- `gateway` (string): the default gateway for this subnet, if one exists.
It does not instruct the CNI plugin to add any routes with this gateway: routes to add are specified separately via the `routes` field.
Expand Down

0 comments on commit 840c8f6

Please sign in to comment.