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.

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

Jump to bottom

Only include ports in one container in Kube YAML #3417

Merged
merged 6 commits into from Jun 25, 2019
Merged

Only include ports in one container in Kube YAML #3417

merged 6 commits into from Jun 25, 2019

Commits on Jun 24, 2019

  1. Only include ports in one container in Kube YAML 

    This likely broke when we made containers able to detect that
they shared a network namespace and grab ports from the
dependency container - prior to that, we could grab ports without
concern for conflict, only the infra container had them. Now, all
containers in a pod will return the same ports, so we have to
work around this.

Fixes containers#3408

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
    @mheon
    mheon committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    ebf48ff View commit details
    Browse the repository at this point in the history

  2. Add test for generate kube on a pod with ports 

    Signed-off-by: Matthew Heon <matthew.heon@pm.me>
    @mheon
    mheon committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    567e7c6 View commit details
    Browse the repository at this point in the history

  3. Change Marshal -> Unmarshal in generate kube tests 

    We need to verify that valid YAML was produced - Marshal will
just pack the generated YAML even further.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
    @mheon
    mheon committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    803a2b0 View commit details
    Browse the repository at this point in the history

  4. Fix tests 

    Signed-off-by: Matthew Heon <matthew.heon@pm.me>
    @mheon
    mheon committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    79d8354 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. Use a different method to retrieve YAML output in tests 

    OutputToString() was mangling newlines, which made YAML parsers
very, very angry. But not angry enough to actually error, that
would be too easy. Just angry enough to silently not decode
anything.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
    @mheon
    mheon committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    101a5cd View commit details
    Browse the repository at this point in the history

  2. Update 'generate kube' tests to verify YAML 

    Signed-off-by: Matthew Heon <matthew.heon@pm.me>
    @mheon
    mheon committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    068d3bb View commit details
    Browse the repository at this point in the history