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

Update ingress controller, and fix integration test #2292

Merged
merged 2 commits into from
Dec 13, 2017
Merged

Update ingress controller, and fix integration test #2292

merged 2 commits into from
Dec 13, 2017

Conversation

kairen
Copy link
Contributor

@kairen kairen commented Dec 9, 2017

In the recent observation, I found the ingress integration test failed in some environment, I think the reason that test fails is that ingress pod not ready yet, so this commit use Retry() to make sure that the test not only run once.

In addition update image for Ingress controller.

/cc @r2d4 @dlorenc

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 9, 2017
@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@dlorenc
Copy link
Contributor

dlorenc commented Dec 11, 2017

@minikube-bot ok to test

@@ -170,6 +170,11 @@ var LocalkubeCachedImages = []string{
// Dashboard
"gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3",

// Ingress Controller
Copy link
Contributor

Choose a reason for hiding this comment

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

These images get cached on all systems - I don't think we want to add them here.

@r2d4 where do you think we should add these? Maybe in common.sh using the minikube cache command in a list?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @r2d4 Could you please help to check this?

@kairen
Copy link
Contributor Author

kairen commented Dec 13, 2017

Hi @dlorenc, I revert cache because of the cache image should not add them here.

@dlorenc
Copy link
Contributor

dlorenc commented Dec 13, 2017

Thanks!

@dlorenc dlorenc merged commit 289e8f6 into kubernetes:master Dec 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants