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

migrate: ignore resources that cannot be listed and updated #21071

Merged

Conversation

enj
Copy link
Contributor

@enj enj commented Sep 21, 2018

This change updates FindAllCanonicalResources to check the verbs asserted by discovery for listing and updating capability. This prevents us from trying to update aggregated resources such as pod metrics.

Bug 1631517

Signed-off-by: Monis Khan mkhan@redhat.com

/kind bug
/assign @deads2k
/cc @jupierce

This change updates FindAllCanonicalResources to check the verbs
asserted by discovery for listing and updating capability.  This
prevents us from trying to update aggregated resources such as pod
metrics.

Bug 1631517

Signed-off-by: Monis Khan <mkhan@redhat.com>
@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Sep 21, 2018
@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 21, 2018
@enj
Copy link
Contributor Author

enj commented Sep 21, 2018

/cherrypick release-3.11

@openshift-cherrypick-robot

@enj: once the present PR merges, I will cherry-pick it on top of release-3.11 in a new PR and assign it to you.

In response to this:

/cherrypick release-3.11

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.

@enj
Copy link
Contributor Author

enj commented Sep 21, 2018

/cherrypick release-3.10

@openshift-cherrypick-robot

@enj: once the present PR merges, I will cherry-pick it on top of release-3.10 in a new PR and assign it to you.

In response to this:

/cherrypick release-3.10

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.

@enj
Copy link
Contributor Author

enj commented Sep 21, 2018

/cherrypick release-3.9

@openshift-cherrypick-robot

@enj: once the present PR merges, I will cherry-pick it on top of release-3.9 in a new PR and assign it to you.

In response to this:

/cherrypick release-3.9

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.

@deads2k
Copy link
Contributor

deads2k commented Sep 21, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 21, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, enj

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

The pull request process is described here

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

@openshift-cherrypick-robot

@enj: #21071 failed to apply on top of branch "release-3.9":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	pkg/oc/cli/admin/migrate/migrator.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/oc/admin/migrate/migrator.go
CONFLICT (content): Merge conflict in pkg/oc/admin/migrate/migrator.go
Patch failed at 0001 migrate: ignore resources that cannot be listed and updated

In response to this:

/cherrypick release-3.9

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.

@openshift-cherrypick-robot

@enj: new pull request created: #21075

In response to this:

/cherrypick release-3.11

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.

@openshift-cherrypick-robot

@enj: #21071 failed to apply on top of branch "release-3.10":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	pkg/oc/cli/admin/migrate/migrator.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/oc/admin/migrate/migrator.go
CONFLICT (content): Merge conflict in pkg/oc/admin/migrate/migrator.go
Patch failed at 0001 migrate: ignore resources that cannot be listed and updated

In response to this:

/cherrypick release-3.10

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.

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. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants