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

e2e: fix restarting the apiserver #42681

Merged
merged 1 commit into from
Mar 8, 2017

Conversation

yujuhong
Copy link
Contributor

@yujuhong yujuhong commented Mar 7, 2017

The string used to match the image name of the apiserver (e.g., gcr.io/google_containers/kube-apiserver:3be...),
but this no longer works. Change the test to locate the kube-apiserver container by name.

@yujuhong yujuhong added kind/bug Categorizes issue or PR as related to a bug. release-note-none Denotes a PR that doesn't merit a release note. labels Mar 7, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 7, 2017
@yujuhong
Copy link
Contributor Author

yujuhong commented Mar 7, 2017

This fixes #42680

@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 7, 2017
@yujuhong yujuhong added the priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. label Mar 7, 2017
@dchen1107
Copy link
Member

/lgtm

and

/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 7, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: dchen1107, yujuhong

Needs approval from an approver in each of these OWNERS Files:

We suggest the following people:
cc @soltysh
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 Mar 7, 2017
@yujuhong
Copy link
Contributor Author

yujuhong commented Mar 7, 2017

@dchen1107, to be clear:

<=1.5:

$ sudo docker ps
CONTAINER ID        IMAGE                                      COMMAND                  CREATED             STATUS              PORTS               NAMES
b94faa1cd7c8        gcr.io/google_containers/kube-apiserver:3be8582ae567bd905ed21ca8b431375d            "/bin/sh -c '/usr/loc"   3 months ago        Up 3 months                             k8s_kube-apiserver.3878919f_kube-apiserver-jenkins-e2e-master_kube-system_d33de50a79071a0944b2e846f71fbebc_184307b4

Now:

$ sudo docker ps
CONTAINER ID        IMAGE                                      COMMAND                  CREATED             STATUS              PORTS               NAMES
bcd77e450c3b        dfb546fe7394                               "/bin/sh -c '/usr/loc"   7 days ago          Up 7 days                               k8s_kube-scheduler_kube-scheduler-e2e-test-yjhong-master_kube-system_cfa6655f2f52a0a17806f3fc173be9bc_0

We no longer tag the image name with gcr.io/google_containers/kube-apiserver:. I don't know why.

@yujuhong
Copy link
Contributor Author

yujuhong commented Mar 8, 2017

@k8s-bot gci gce e2e test this

@yujuhong yujuhong added this to the v1.6 milestone Mar 8, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 42652, 42681, 42708, 42730)

@k8s-github-robot k8s-github-robot merged commit 1402cc5 into kubernetes:master Mar 8, 2017
@yujuhong yujuhong deleted the fix_restart branch March 13, 2017 17:58
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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants