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

Fix e2e testing issue #1424

Merged
merged 2 commits into from
Sep 24, 2014
Merged

Fix e2e testing issue #1424

merged 2 commits into from
Sep 24, 2014

Conversation

dchen1107
Copy link
Member

It turns out the fqdn issue is the only issue in e2e test. I ran into some weird ApiObj encode/decode issue, which is fixed by 'make clean' completely.

Fix #1385

@thockin
Copy link
Member

thockin commented Sep 24, 2014

LGTM

if len(suffix) > 0 {
suffix = "." + suffix
}
res, err := gce.service.Instances.Get(gce.projectID, gce.zone, strings.Replace(instance, suffix, "", 1)).Do()
Copy link
Member

Choose a reason for hiding this comment

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

Perhaps strings.TrimRight is more appropriate.

@lavalamp
Copy link
Member

LGTM aside from nits

@jbeda
Copy link
Contributor

jbeda commented Sep 24, 2014

I fixed this same issue last night! I was going to send it out today. I think we can make this a little simpler by just "canonicalizing" the instance name by stripping off everything past the first dot. We do that in makeHostLink too and I factored it out in a function.

My change is here: https://github.com/jbeda/kubernetes/compare/hostIP-fix

I also was extending the e2e test to make sure that the hostIP is created/passed through for GCE as that is one place where this shows up broken.

Feel free to steal what you like. I don't mind checking in the e2e test enhancement after yours goes in.

@dchen1107
Copy link
Member Author

@jbeda I worked on this fix because I tried to enhance e2e test a little bit last Friday, and found it never pass for me. I will take a look at your change, and steal whatever I might need to get this in as early as possible since this PR block my another PR due to e2e test failure. Thanks!

@dchen1107
Copy link
Member Author

@thockin @jbeda @lavalamp This is new version of same fix which pretty much extract from Joe's another PR since it also fixes makeHostLink too. PTAL? Thanks

@jbeda
Copy link
Contributor

jbeda commented Sep 24, 2014

LGTM -- merging after travis says okay.

jbeda added a commit that referenced this pull request Sep 24, 2014
@jbeda jbeda merged commit e1a07c0 into kubernetes:master Sep 24, 2014
deads2k pushed a commit to deads2k/kubernetes that referenced this pull request Nov 18, 2022
UPSTREAM: <drop>: Bump openshift/api.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

e2e test hung on Error getting instance IP
4 participants