Skip to content
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.

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

Update to Windows network options #801

Merged
merged 1 commit into from
May 23, 2017

Conversation

darstahl
Copy link
Contributor

This moves the Windows network runtime options into the spec.

NetworkResourceSettings was never used in the runtime spec, and implemented in HNS and libnetwork instead of at runtime on Windows.

/cc @RobDolinMS

Signed-off-by: Darren Stahl darst@microsoft.com

@crosbymichael
Copy link
Member

Doesn't the md files need to be updated as well

@darstahl
Copy link
Contributor Author

Yep. Updating that now.

@darstahl
Copy link
Contributor Author

Updated md and json

}
"allowUnqualifiedDNSQuery": {
"id": "https://opencontainers.org/schema/bundle/windows/network/allowUnqualifiedDNSQuery",
"$ref": "defs.json#/definitions/bool"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Travis doesn't like bool. I think you want "type": "boolean".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yep. Fixed it for string, but missed bool. Pushing a fix


The following parameters can be specified:

* **`egressBandwidth`** *(uint64, OPTIONAL)* - specified the maximum egress bandwidth in bytes per second for the container.
* **`endpointList`** (array of strings, OPTIONAL) list of HNS endpoints that the container should connect to.
* **`allowUnqualifiedDNSQuery`** *(bool, OPTIONAL)* - specifies if unqualified DNS name resolution is allowed.
Copy link
Contributor

@wking wking May 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has inconsistent use of * and the trailing hyphen. The rest of master isn't very consistent either, but config.md seems to prefer:

**`{name}`** ({type}, OPTIONAL) {description}

(i.e. no * around the type/optional parens and no hyphen afterwards). It doesn't really matter which way you go, but it's probably best to avoid switching patterns in mid-list ;).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to match the rest of this file for now (* around type/optional, hyphen after). The whole file can get converged at once in another PR that way if desired.


The following parameters can be specified:

* **`egressBandwidth`** *(uint64, OPTIONAL)* - specified the maximum egress bandwidth in bytes per second for the container.
* **`endpointList`** (array of strings, OPTIONAL) list of HNS endpoints that the container should connect to.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HNS -> DNS ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If not, could link to what HNS means in official documentation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HNS is Host Network Service on Windows (manages all container networking). I can add clarification.

@lowenna
Copy link
Contributor

lowenna commented May 15, 2017

@wking - With the debate about whether Windows gets in for 1.0, the deprecation part of this PR is probably important for v1.0. I'm not sure if it makes sense to split this into two PRs - one for the deprecation, and one for the addition. Thoughts?

@wking
Copy link
Contributor

wking commented May 15, 2017 via email

@lowenna
Copy link
Contributor

lowenna commented May 23, 2017

Changes LGTM (not a maintainer). Unfortunately needs a rebase. And may require subsequent rebases depending on the order in which the Windows PRs are merged

@darstahl
Copy link
Contributor Author

Rebased

@lowenna
Copy link
Contributor

lowenna commented May 23, 2017

Sorry, needs one more rebase.....

Signed-off-by: Darren Stahl <darst@microsoft.com>
@darstahl
Copy link
Contributor Author

Rebased again

@crosbymichael
Copy link
Member

crosbymichael commented May 23, 2017

LGTM

Approved with PullApprove

1 similar comment
@tianon
Copy link
Member

tianon commented May 23, 2017

LGTM

Approved with PullApprove

@tianon tianon merged commit 49b0a1f into opencontainers:master May 23, 2017
wking added a commit to wking/opencontainer-runtime-spec that referenced this pull request May 23, 2017
Catching 6b2fcaf (Update to Windows network options, 2017-05-10,
opencontainers#801) up with the anchoring policy from style.md.

Signed-off-by: W. Trevor King <wking@tremily.us>
@vbatts vbatts mentioned this pull request Jul 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants