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

Same internal and external ip for vSphere Cloud Provider #45201

Merged
merged 1 commit into from
May 18, 2017

Conversation

abrarshivani
Copy link
Contributor

@abrarshivani abrarshivani commented May 2, 2017

Currently, vSphere Cloud Provider reports internal ip as container ip addresses. This PR modifies vSphere Cloud Provider to report same ip address as both internal and external that is provided by vmware infrastructure.
cc @pdhamdhere @tusharnt @BaluDontu @divyenpatel @luomiao

vSphere cloud provider: Report same Node IP as both internal and external.

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

This change is Reviewable

@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels May 2, 2017
@dims
Copy link
Member

dims commented May 2, 2017

/unassign @dims

@abrarshivani abrarshivani changed the title Made internal and external ip same for vSphere Cloud Provider Same internal and external ip for vSphere Cloud Provider May 2, 2017
Address: ip,
},
)
for _, ip := range v.IpAddress {
Copy link
Member

Choose a reason for hiding this comment

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

There is PR in review from @BaluDontu touching the same code - #45181
Can we merge both PRs to reduce cherry pick the resolve conflict effort?

@divyenpatel
Copy link
Member

We have e2e test which uses common func from https://github.com/kubernetes/kubernetes/blob/master/test/e2e/framework/util.go#L4506, this returns first address in the range

Can we ssh into node using any returned IP address?

@abrarshivani
Copy link
Contributor Author

@divyenpatel Yes, we can ssh into node using any returned IP address as long as you are running tests from the external network defined for the VMs.

@abrarshivani
Copy link
Contributor Author

@bprashanth Can you please review this PR?

@divyenpatel
Copy link
Member

lgtm

@luomiao
Copy link

luomiao commented May 9, 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 9, 2017
@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 9, 2017
@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 13, 2017
@luomiao
Copy link

luomiao commented May 13, 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 13, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abrarshivani, luomiao

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

@divyenpatel
Copy link
Member

@bprashanth can you help removing "do-not-merge" label.

@pmorie
Copy link
Member

pmorie commented May 17, 2017

/release-note

@k8s-ci-robot k8s-ci-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 17, 2017
@saad-ali saad-ali removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label May 18, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit be71ec7 into kubernetes:master May 18, 2017
k8s-github-robot pushed a commit that referenced this pull request May 23, 2017
…-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #45201 upstream release 1.6

Cherry pick of #45201 on release-1.6.

#45201 : Same internal and external ip for vSphere Cloud Provider.

@BaluDontu @tusharnt
cbonte added a commit to cbonte/kubernetes that referenced this pull request Jul 19, 2017
When a node IP is set and a cloud provider returns the same address with
several types, on the first address was accepted. With the changes made
in PR kubernetes#45201, the vSphere cloud provider returned the ExternalIP first,
which led to a node without any InternalIP.

The behaviour is modified to return all the address types for the
specified node IP.

Issue kubernetes#48760
cbonte added a commit to cbonte/kubernetes that referenced this pull request Aug 29, 2017
When a node IP is set and a cloud provider returns the same address with
several types, on the first address was accepted. With the changes made
in PR kubernetes#45201, the vSphere cloud provider returned the ExternalIP first,
which led to a node without any InternalIP.

The behaviour is modified to return all the address types for the
specified node IP.

Issue kubernetes#48760
vdemeester pushed a commit to vdemeester/kubernetes that referenced this pull request Sep 7, 2017
Automatic merge from submit-queue (batch tested with PRs 51728, 49202)

Fix setNodeAddress when a node IP and a cloud provider are set

**What this PR does / why we need it**:
When a node IP is set and a cloud provider returns the same address with
several types, only the first address was accepted. With the changes made
in PR kubernetes#45201, the vSphere cloud provider returned the ExternalIP first,
which led to a node without any InternalIP.

The behaviour is modified to return all the address types for the
specified node IP.

**Which issue this PR fixes**: fixes kubernetes#48760

**Special notes for your reviewer**:
* I'm not a golang expert, is it possible to mock `kubelet.validateNodeIP()` to avoid the need of real host interface addresses in the test ?
* It would be great to have it backported for a next 1.6.8 release.

**Release note**:
```release-note
NONE
```
cbonte added a commit to cbonte/kubernetes that referenced this pull request Sep 8, 2017
When a node IP is set and a cloud provider returns the same address with
several types, on the first address was accepted. With the changes made
in PR kubernetes#45201, the vSphere cloud provider returned the ExternalIP first,
which led to a node without any InternalIP.

The behaviour is modified to return all the address types for the
specified node IP.

Issue kubernetes#48760
cbonte added a commit to cbonte/kubernetes that referenced this pull request Sep 9, 2017
When a node IP is set and a cloud provider returns the same address with
several types, on the first address was accepted. With the changes made
in PR kubernetes#45201, the vSphere cloud provider returned the ExternalIP first,
which led to a node without any InternalIP.

The behaviour is modified to return all the address types for the
specified node IP.

Issue kubernetes#48760
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

None yet

10 participants