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 panic when processing DeleteBackupRequest objs without labels #1556

Merged

Conversation

prydonius
Copy link
Contributor

This fix initialises an empty map if the request object's Labels map
is nil, allowing the controller to later add and modify labels on the
object.

fixes #1546

Signed-off-by: Adnan Abdulhussein aadnan@vmware.com

Copy link
Contributor

@skriss skriss left a comment

Choose a reason for hiding this comment

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

LGTM! Please add a changelog file as well (changelogs/unreleased/1556-prydonius) with a one-line description of the fix. You can amend the existing commit to add the changelog.

This fix initialises an empty map if the request object's Labels map
is nil, allowing the controller to later add and modify labels on the
object.

Signed-off-by: Adnan Abdulhussein <aadnan@vmware.com>
@prydonius prydonius force-pushed the 1546-fix-backup-delete-req-panic branch from 1f70c6e to 311b84d Compare June 7, 2019 21:51
@prydonius
Copy link
Contributor Author

done :) ptal

@skriss
Copy link
Contributor

skriss commented Jun 8, 2019

👍

@skriss
Copy link
Contributor

skriss commented Jun 10, 2019

@carlisia or @nrb this should be good to go pending your review

Copy link
Contributor

@carlisia carlisia left a comment

Choose a reason for hiding this comment

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

👍

@carlisia carlisia merged commit d6c60b2 into vmware-tanzu:master Jun 10, 2019
@prydonius prydonius deleted the 1546-fix-backup-delete-req-panic branch June 10, 2019 17:37
jessestuart added a commit to jessestuart/velero that referenced this pull request Jun 18, 2019
* upstream/master: (220 commits)
  Add restic instructions for Enterprise PKS (vmware-tanzu#1579)
  Adding Adnan to the team
  Discontinue use of excerpt separators in blog posts. (vmware-tanzu#1578)
  migrate PV snapshot tests
  migrate more backup action tests, remove obsolete test code (vmware-tanzu#1564)
  hide server commands in velero CLI (vmware-tanzu#1561)
  Fix test comparison
  remove glog (vmware-tanzu#1559)
  move issue-template-gen from docs/ to hack/ (vmware-tanzu#1558)
  update go-plugin to latest for bug fix (vmware-tanzu#1560)
  fix panic when processing DeleteBackupRequest objs without labels (vmware-tanzu#1556)
  Refactoring for backup item action tests (vmware-tanzu#1545)
  Support for multiple AWS profiles (vmware-tanzu#1548)
  add a link of velero plugin for alibabacloud to support-matrix docs
  fixes inlining of command in GCP setup docs (vmware-tanzu#1547)
  Signed-off-by: David Coons <coonsd@oregonstate.edu> (vmware-tanzu#1550)
  Add cmd to list plugins (vmware-tanzu#1535)
  Add ability to use wildcard in includes/excludes
  Initial pkg/backup test refactoring (vmware-tanzu#1532)
  Only run CI when relevant files have changed
  ...
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.

Velero panics on delete backup request when done using the API
3 participants