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

Add ip-masq-agent addon to the addons folder. #46038

Merged
merged 1 commit into from
May 19, 2017
Merged

Add ip-masq-agent addon to the addons folder. #46038

merged 1 commit into from
May 19, 2017

Conversation

dnardo
Copy link
Contributor

@dnardo dnardo commented May 18, 2017 •
edited
Loading

This also ensures that under gce we add this DaemonSet if the non-masq-cidr
is set to 0/0.

What this PR does / why we need it:

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

Release note:

Add ip-masq-agent addon to the addons folder which is used in GCE if  --non-masquerade-cidr is set to 0/0

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 18, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @dnardo. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 18, 2017
@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels May 18, 2017
@mtaufen
Copy link
Contributor

mtaufen commented May 18, 2017

@k8s-bot ok to test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 18, 2017
@mtaufen mtaufen assigned mtaufen and thockin and unassigned jbeda and eparis May 18, 2017
mtaufen
mtaufen reviewed May 18, 2017
View reviewed changes
cluster/gce/gci/configure-helper.sh Outdated
@@ -1423,6 +1423,9 @@ function start-kube-addons {
if [[ "${ENABLE_DEFAULT_STORAGE_CLASS:-}" == "true" ]]; then
setup-addon-manifests "addons" "storage-class/gce"
fi
if [[ -n "${NON_MASQUERADE_CIDR:-}" == "0.0.0.0/0" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't know bash in this much detail, how does this if statement evaluate?
(-n "${NON_MASQUERADE_CIDR:-}") == "0.0.0.0/0"? because True != "0.0.0.0/0"...
(-n "${NON_MASQUERADE_CIDR:-}") && ("${NON_MASQUERADE_CIDR:-}" == "0.0.0.0/0")?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mtaufen you are right, good catch thanks.

Copy link
Contributor

Choose a reason for hiding this comment

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

sure thing :)

mtaufen
mtaufen reviewed May 18, 2017
View reviewed changes
cluster/addons/ip-masq-agent/README.md Outdated

## Releasing

See [RELEASE](RELEASE.md).
Copy link
Contributor

Choose a reason for hiding this comment

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

Oops, missed this on my first pass: point this link at https://github.com/kubernetes-incubator/ip-masq-agent/blob/v2.0.0/README.md

Might be better to just link to the README at the version tag used in the manifest in addons/, instead of duplicating the README here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mtaufen Added at a link at the top of the DaemonSet yaml file. Removed readme.

@mtaufen
Copy link
Contributor

mtaufen commented May 18, 2017

one nit in the readme and then /lgtm

@mtaufen
Copy link
Contributor

mtaufen commented May 18, 2017

Also either add a release note or type NONE in the release note section.

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 18, 2017
@dnardo
Copy link
Contributor Author

dnardo commented May 18, 2017

@mtaufen updated the release notes section.

@k8s-github-robot k8s-github-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels May 18, 2017
@dnardo
Copy link
Contributor Author

dnardo commented May 19, 2017

@k8s-bot unit test this

mtaufen
mtaufen reviewed May 19, 2017
View reviewed changes
cluster/addons/ip-masq-agent/ip-masq-agent.yaml Outdated
name: ip-masq-agent
namespace: kube-system
labels:
kubernetes.io/cluster-service: "true"
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure you need this label, https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/addon-manager/README.md seems to say that it's deprecated.

@mtaufen
Copy link
Contributor

mtaufen commented May 19, 2017

/lgtm
I had one comment I missed on my first pass, otherwise LGTM.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 19, 2017
@mtaufen
Copy link
Contributor

mtaufen commented May 19, 2017

@k8s-bot unit test this

Add ip-masq-agent addon to the addons folder. This also
96ae346 
ensures that under gce we add this daemonset if the non-masq-cidr
is set to 0/0.
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 19, 2017
@dnardo
Copy link
Contributor Author

dnardo commented May 19, 2017

@mtaufen removed the cluster-service label.

@mtaufen
Copy link
Contributor

mtaufen commented May 19, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 19, 2017
@mtaufen
Copy link
Contributor

mtaufen commented May 19, 2017

@k8s-bot unit test this

@thockin
Copy link
Member

thockin commented May 19, 2017

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dnardo, mtaufen, thockin

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 19, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 44606, 46038)

@k8s-github-robot k8s-github-robot merged commit d3aa925 into kubernetes:master May 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mtaufen mtaufen mtaufen left review comments

Assignees

@mtaufen mtaufen

@thockin thockin

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@dnardo @k8s-ci-robot @mtaufen @thockin @k8s-github-robot @jbeda @eparis