Skip to content

Fix DsFromManifest() after we switch from extensions/v1beta1 to apps/v1#64340

Merged
k8s-github-robot merged 1 commit intokubernetes:masterfrom
jiayingz:ds_decode_fix
May 26, 2018
Merged

Fix DsFromManifest() after we switch from extensions/v1beta1 to apps/v1#64340
k8s-github-robot merged 1 commit intokubernetes:masterfrom
jiayingz:ds_decode_fix

Conversation

@jiayingz
Copy link
Copy Markdown
Contributor

@jiayingz jiayingz commented May 25, 2018

in cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml.

What this PR does / why we need it:
Fixes broken node e2e jobs caused by #64296.

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

Special notes for your reviewer:

Release note:

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented May 25, 2018

@jiayingz: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 25, 2018
@k8s-ci-robot k8s-ci-robot requested review from jbeda and rmmh May 25, 2018 21:52
@jiayingz
Copy link
Copy Markdown
Contributor Author

jiayingz commented May 25, 2018

/release-note-none
/sig node
/assign @yujuhong @vishh

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label May 25, 2018
@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 25, 2018
@vishh
Copy link
Copy Markdown
Contributor

vishh commented May 25, 2018

There is an accidental tar file included in this commit. Please remove it.

Otherwise /lgtm /approve

@jiayingz jiayingz force-pushed the ds_decode_fix branch 2 times, most recently from 83a2f5a to a3236ea Compare May 25, 2018 22:10
@jiayingz
Fix DsFromManifest() after we switch from extensions/v1beta1 to apps/v1
6e0badc 
in cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml.
@jiayingz
Copy link
Copy Markdown
Contributor Author

jiayingz commented May 26, 2018

/test pull-kubernetes-e2e-gce-device-plugin-gpu

@vishh
Copy link
Copy Markdown
Contributor

vishh commented May 26, 2018

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 26, 2018
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented May 26, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jiayingz, vishh

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 26, 2018
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented May 26, 2018 •
edited
Loading

@jiayingz: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-e2e-gce-device-plugin-gpu 6e0badc link /test pull-kubernetes-e2e-gce-device-plugin-gpu

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-github-robot
Copy link
Copy Markdown

k8s-github-robot commented May 26, 2018

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 15c22b5 into kubernetes:master May 26, 2018
@wgliang wgliang mentioned this pull request May 28, 2018
Closed
@soltysh
Copy link
Copy Markdown
Contributor

soltysh commented May 28, 2018

This PR is not quite right, DaemonSet internals still exists in extensions, you can't update that to apps, which broke these tests. I've fixed those in #64404 but it looks like you have a mess in DS tests :/

@jiayingz jiayingz mentioned this pull request May 29, 2018
Merged
@grosskur
Copy link
Copy Markdown
Contributor

grosskur commented May 29, 2018

My pull request (#63997) is failing e2e node tests due to the DaemonSet switch from extensions/v1beta1 to apps/v1. I think we need to cherry-pick this fix into the release-1.9 branch /cc @mbohlool

@rohitagarwal003
Copy link
Copy Markdown
Member

rohitagarwal003 commented May 29, 2018

@grosskur Yeah, here's the 1.9 PR: #64342

@grosskur
Copy link
Copy Markdown
Contributor

grosskur commented May 29, 2018

Great, thanks!

k8s-github-robot pushed a commit that referenced this pull request May 30, 2018
Merge pull request #64478 from jiayingz/automated-cherry-pick-of-#64296-
4d9a60b 
#64340-#64404-upstream-release-1.10

Automatic merge from submit-queue.

Automated cherry pick of #64296: Update nvidia-gpu-device-plugin to apps/v1 and use #64340: Fix DsFromManifest() after we switch from extensions/v1beta1 #64404: DaemonSet internals are still in extensions

Cherry pick of #64296 #64340 #64404 on release-1.10.

#64296: Update nvidia-gpu-device-plugin to apps/v1 and use
#64340: Fix DsFromManifest() after we switch from extensions/v1beta1
#64404: DaemonSet internals are still in extensions

```release-note
Fix nvidia-gpu-device-plugin DaemonSet config to ensure correct device plugin upgrade
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jbeda jbeda Awaiting requested review from jbeda

@rmmh rmmh Awaiting requested review from rmmh

Assignees

@vishh vishh

@yujuhong yujuhong

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-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@jiayingz @k8s-ci-robot @vishh @k8s-github-robot @soltysh @grosskur @rohitagarwal003 @yujuhong