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 readiness label by default. #47794

Merged
merged 1 commit into from
Jun 21, 2017
Merged

Add ip-masq-agent readiness label by default. #47794

merged 1 commit into from
Jun 21, 2017

Conversation

dnardo
Copy link
Contributor

@dnardo dnardo commented Jun 20, 2017 •
edited
Loading

Since we are setting the non-masq-cidr in the kubelet to 0.0.0.0/0 we
need to ensure the ip-masq-agent runs.

pr/#46473 made the NON_MASQUERADE_CIDR default to 0.0.0.0/0 which means we need to have this label set now.

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 #
fixes #47752
Special notes for your reviewer:

Release note:

ip-masq-agent is now the default for GCE

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 20, 2017
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Jun 20, 2017
@dnardo
Copy link
Contributor Author

dnardo commented Jun 20, 2017

/assign @dchen1107

@dnardo
Copy link
Contributor Author

dnardo commented Jun 20, 2017

/unassign @vishh

@k8s-ci-robot k8s-ci-robot assigned dchen1107 and unassigned vishh Jun 20, 2017
@dnardo
Copy link
Contributor Author

dnardo commented Jun 20, 2017

/assign @roberthbailey

@dnardo dnardo mentioned this pull request Jun 20, 2017
Merged
@dnardo
Copy link
Contributor Author

dnardo commented Jun 20, 2017

@roberthbailey pointed out that we should make the gce tests consistent with the gce default scripts. I've updated the PR to include this.

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 20, 2017
@roberthbailey
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 20, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Jun 20, 2017
dchen1107
dchen1107 reviewed Jun 20, 2017
View reviewed changes
cluster/gce/config-test.sh
@@ -282,6 +286,9 @@ OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}"
# Network Policy plugin specific settings.
NETWORK_POLICY_PROVIDER="${NETWORK_POLICY_PROVIDER:-none}" # calico

# Should the kubelet configure egress masquerade (old way) or let a daemonset do it?
NON_MASQUERADE_CIDR="0.0.0.0/0"
Copy link
Member

Choose a reason for hiding this comment

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

Why we require this in config-test.sh, not in default one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's already in the default one. Also the config-test appears to be a separate from config-default.sh (i.e. config-test doesn't source config-default)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

btw: That is probably why the gce tests were passing while the gke tests were failing.

@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 Jun 20, 2017
@roberthbailey
Copy link
Contributor

release note added, removing the do-not-merge label.

@roberthbailey roberthbailey removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Jun 20, 2017
@gmarek gmarek added this to the v1.7 milestone Jun 20, 2017
@gmarek
Copy link
Contributor

gmarek commented Jun 20, 2017

I guess it's 1.7

@gmarek
Copy link
Contributor

gmarek commented Jun 20, 2017

/retest

@cmluciano
Copy link

/retest

failures seem to be within the flaky features

@dnardo
Copy link
Contributor Author

dnardo commented Jun 20, 2017

/retest

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 20, 2017
@dnardo
Copy link
Contributor Author

dnardo commented Jun 20, 2017

/retest

@roberthbailey
Copy link
Contributor

/lgtm

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

dnardo commented Jun 20, 2017

/retest

Add ip-masq-agent readiness label by default. Since we are
fc279e0 
setting the non-masq-cidr in the kubelet to 0.0.0.0/0 we
need to ensure the ip-masq-agent runs.

Add node label pre-req back to ip-masq-agent.

Make gce test consistent with gce default scripts.
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 20, 2017
@dnardo
Copy link
Contributor Author

dnardo commented Jun 21, 2017

/retest

@dnardo
Copy link
Contributor Author

dnardo commented Jun 21, 2017

Ok, should be fixed. Tests are passing now. I'll need an lgtm one more time. Thanks

@roberthbailey
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 21, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dnardo, roberthbailey

Associated issue: 46473

The full list of commands accepted by this bot can be found here.

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
Copy link

Automatic merge from submit-queue

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

@dchen1107 dchen1107 dchen1107 left review comments

Assignees

@gmarek gmarek

@dchen1107 dchen1107

@roberthbailey roberthbailey

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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

ip-masq-agent not scheduling on 1.5 nodes with a 1.7 master
8 participants
@dnardo @roberthbailey @gmarek @cmluciano @k8s-github-robot @dchen1107 @vishh @k8s-ci-robot