Skip to content

[esipp-e2e] Change service port to avoid collision#47986

Merged
k8s-github-robot merged 1 commit intokubernetes:masterfrom
MrHohn:e2e-esipp-change-port
Jun 24, 2017
Merged

[esipp-e2e] Change service port to avoid collision#47986
k8s-github-robot merged 1 commit intokubernetes:masterfrom
MrHohn:e2e-esipp-change-port

Conversation

@MrHohn
Copy link
Copy Markdown
Member

@MrHohn MrHohn commented Jun 23, 2017

What this PR does / why we need it: As #47745 (comment) indicates, changing service port in test to avoid collision.

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

Special notes for your reviewer:

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 23, 2017
@MrHohn
Copy link
Copy Markdown
Member Author

MrHohn commented Jun 23, 2017

/assign @nicksardo
Hey Nick do you mind taking a look :)

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels Jun 23, 2017
@MrHohn
Copy link
Copy Markdown
Member Author

MrHohn commented Jun 23, 2017

/retest

@MrHohn MrHohn force-pushed the e2e-esipp-change-port branch from 4325d07 to 2cb9f5d Compare June 23, 2017 21:14
MrHohn
MrHohn commented Jun 23, 2017
View reviewed changes
test/e2e/service.go
// in other tests that run in parallel.
if len(svc.Spec.Ports) != 0 {
svc.Spec.Ports[0].TargetPort = intstr.FromInt(int(svc.Spec.Ports[0].Port))
svc.Spec.Ports[0].Port = 8081
Copy link
Copy Markdown
Member Author

@MrHohn MrHohn Jun 23, 2017

Choose a reason for hiding this comment

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

@nicksardo Changed assignment order.

Copy link
Copy Markdown
Contributor

@nicksardo nicksardo Jun 23, 2017

Choose a reason for hiding this comment

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

Awesome, thanks!

@nicksardo
Copy link
Copy Markdown
Contributor

nicksardo commented Jun 23, 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 Jun 23, 2017
@MrHohn
Copy link
Copy Markdown
Member Author

MrHohn commented Jun 23, 2017

Thanks!

/assign @bowei
for approval.

@bowei
Copy link
Copy Markdown
Member

bowei commented Jun 23, 2017

/lgtm

@k8s-github-robot
Copy link
Copy Markdown

k8s-github-robot commented Jun 23, 2017

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MrHohn, bowei, nicksardo

Associated issue: 47745

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

Details 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 Jun 23, 2017
@k8s-github-robot
Copy link
Copy Markdown

k8s-github-robot commented Jun 24, 2017

Automatic merge from submit-queue (batch tested with PRs 47650, 47936, 47939, 47986, 48006)

@k8s-github-robot k8s-github-robot merged commit 3da95b6 into kubernetes:master Jun 24, 2017
@dchen1107
Copy link
Copy Markdown
Member

dchen1107 commented Jun 26, 2017 •
edited
Loading

Shouldn't this cherrypick to 1.7 branch since test - ESIPP [Slow] should only target nodes with endpoints is one of the most flaky test?

cc/ @kubernetes/kubernetes-release-managers

@dchen1107 dchen1107 added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate labels Jun 26, 2017
@k8s-cherrypick-bot
Copy link
Copy Markdown

k8s-cherrypick-bot commented Jun 26, 2017

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@caesarxuchao
Copy link
Copy Markdown
Contributor

caesarxuchao commented Jun 27, 2017

I'll do a batch cherrypick.

@MrHohn
Copy link
Copy Markdown
Member Author

MrHohn commented Jun 27, 2017

@caesarxuchao Thanks!

@caesarxuchao caesarxuchao added this to the v1.7 milestone Jun 27, 2017
@caesarxuchao caesarxuchao mentioned this pull request Jun 27, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Jun 27, 2017
Merge pull request #48146 from caesarxuchao/automated-cherry-pick-of-…
625cfe5 
…#47986-#47152-#47860-#47945-#47961-#47986-#47993-#48012-#48085-upstream-release-1.7

Automatic merge from submit-queue

Automated cherry pick of #47986 #47152 #47860 #47945 #47961 #47986 #47993 #48012 #48085

Cherry pick of #47986 #47152 #47860 #47945 #47961 #47986 #47993 #48012 #48085 on release-1.7.

#47986: Change service port to avoid collision
#47152: Kubelet doesn't override addrs from Cloud provider
#47860: Make fluentd log to stdio instead of a dedicated file
#47945: add level for print flags
#47961: Bumped Heapster to v1.4.0-beta.0
#47986: Change service port to avoid collision
#47993: Use a different env var to enable the ip-masq-agent addon. We
#48012: Extending timeout waiting for delete node to become ready
#48085: Move iptables logging in kubeproxy from Errorf to V(2).Infof
@k8s-cherrypick-bot
Copy link
Copy Markdown

k8s-cherrypick-bot commented Jun 28, 2017

Commit found in the "release-1.7" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@MrHohn MrHohn deleted the e2e-esipp-change-port branch October 5, 2017 00:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@nicksardo nicksardo nicksardo left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@nicksardo nicksardo

@bowei bowei

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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-none Denotes a PR that doesn't merit a release note. 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.

[k8s.io] ESIPP [Slow] should only target nodes with endpoints flaky

8 participants

@MrHohn @nicksardo @bowei @k8s-github-robot @dchen1107 @k8s-cherrypick-bot @caesarxuchao @k8s-ci-robot