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

Require a label to indicate ip-masq-agent readiness. #47764

Merged
merged 1 commit into from
Jun 20, 2017
Merged

Require a label to indicate ip-masq-agent readiness. #47764

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cluster/addons/ip-masq-agent/ip-masq-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ spec:
volumeMounts:
- name: config
mountPath: /etc/config
nodeSelector:
beta.kubernetes.io/masq-agent-ds-ready: "true"
Copy link
Member

Choose a reason for hiding this comment

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

should this label be added to 1.7 nodes?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes.

Copy link
Contributor

Choose a reason for hiding this comment

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

But I don't see that it was added to https://github.com/kubernetes/kubernetes/blob/master/cluster/gce/config-test.sh

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right but if those env vars are set in GKE that would also handle this.

Yesterday a PR that set NON_MASQUERADE_CIDR=0.0.0.0/0 in the gce scripts was reverted. Since that was reverted the non-masq-cidr will get set to 10/8. If that is the case the the ip-masq-agent won't even run and the kubelet would take care of the masquerading. So I think that whether those labels are set here doesn't matter.

I think what is needed now is that we set gce back to using NON_MASQUERADE_CIDR=0.0.0.0/0 and we add the labels.

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 think the confusion on my end is that I thought pr/#46473 was reverted. Which would have made this moot, but it turns out it wasn't.

pr/#47794 should fix the issue.

Copy link
Member

Choose a reason for hiding this comment

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

yeah, I asked #47764 (comment) which assume ip-masq-agent won't run since there is no node marking with the newly introduced label. But on my side, I was confused that NON_MASQUERADE_CIDR=0.0.0.0/0 is another label on Kubelet which tells Kubelet to stop masq-ing. :-( @mikedanese Thanks for spot the issue.

volumes:
- name: config
configMap:
Expand Down