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.

Sign up for GitHub

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

Jump to bottom

UPSTREAM: 48763: Add Local and Unstructured resource builder attributes and handle <rsrsc> / <name> pairs when --local is set #15140

Closed
wants to merge 5 commits into from
Closed

UPSTREAM: 48763: Add Local and Unstructured resource builder attributes and handle <rsrsc> / <name> pairs when --local is set #15140

wants to merge 5 commits into from

Conversation

juanvallejo
Copy link
Contributor

Related BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1390139

Adds an error message if a / pair is specified in an oc set ... sub command with a --local flag.

# oc set image dc/idling-echo idling-tcp-echo=ruby:2.0 --local -o yaml
error: you must specify resources by --filename when --local is set.
Example resource specifications include:
   '-f rsrc.yaml'
   '--filename=rsrc.json'

cc @openshift/cli-review

@juanvallejo
Copy link
Contributor Author

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to a932a1f

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3046/) (Base Commit: 6c5dafb) (PR Branch Commit: a932a1f)

@juanvallejo
Copy link
Contributor Author

cc @liggitt

@juanvallejo juanvallejo changed the title add error message if <rsrc>/<name> pairs are specified w/ --local flag UPSTREAM: 48763: add error message if <rsrc>/<name> pairs are specified w/ --local flag Jul 11, 2017
@openshift-merge-robot openshift-merge-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 24, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: juanvallejo
We suggest the following additional approver: mfojtik

Assign the PR to them by writing /assign @mfojtik in a comment when ready.

No associated issue. Update pull-request body to add a reference to an issue, or get approval with /approve no-issue

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

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

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 27, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: juanvallejo
We suggest the following additional approver: mfojtik

Assign the PR to them by writing /assign @mfojtik in a comment when ready.

No associated issue. Update pull-request body to add a reference to an issue, or get approval with /approve no-issue

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

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

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 28, 2017
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Oct 14, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/add-local-set-cmd-err-message branch from a932a1f to 5f39bce Compare October 26, 2017 16:04
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 26, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/add-local-set-cmd-err-message branch from 5f39bce to 7790554 Compare October 26, 2017 19:23
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 26, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/add-local-set-cmd-err-message branch from 7790554 to c2dfbdd Compare October 26, 2017 20:04
@juanvallejo juanvallejo changed the title UPSTREAM: 48763: add error message if <rsrc>/<name> pairs are specified w/ --local flag UPSTREAM: 48763: Add Local and Unstructured resource builder attributes and handle <rsrsc> / <name> pairs when --local is set Oct 26, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/add-local-set-cmd-err-message branch 2 times, most recently from 4ad399e to 477445b Compare October 26, 2017 23:21
@juanvallejo
Copy link
Contributor Author

/retest

@juanvallejo juanvallejo force-pushed the jvallejo/add-local-set-cmd-err-message branch 2 times, most recently from 6fc0e06 to 0a80a6e Compare October 27, 2017 19:31
@juanvallejo
Copy link
Contributor Author

/kind bug

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Oct 30, 2017
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2017
@juanvallejo
UPSTREAM: 48763: add err message if <rsrc>/<name> pairs specified w/ …
fcbeb0c 
…--local
@juanvallejo
UPSTREAM: 48763: add Local and Unstructured builder attributes
162776f 
Moves DisabledClientMapperForMapping wrapper to new Local attribute.
Removes Factory#NewUnstructuredBuilder in favor of new Unstructured
builder attribute.
@juanvallejo juanvallejo force-pushed the jvallejo/add-local-set-cmd-err-message branch from 0a80a6e to 044b8a9 Compare November 20, 2017 17:09
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/add-local-set-cmd-err-message branch from 044b8a9 to 445ad72 Compare November 20, 2017 20:51
@juanvallejo
Copy link
Contributor Author

/retest

@juanvallejo
Copy link
Contributor Author

/test extended_conformance_gce

1 similar comment
@juanvallejo
Copy link
Contributor Author

/test extended_conformance_gce

@fabianofranz
Copy link
Member

@deads2k can you PTAL if this hits the new rebase too hard? The upstream commits are there for some time already.

@juanvallejo
Copy link
Contributor Author

Closing as the current rebase appears to be bringing these commits in: 2b1e0d4#diff-2c0180e8c8452be63baa6d1c6877dc8eR225

@juanvallejo juanvallejo closed this Dec 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabianofranz fabianofranz Awaiting requested review from fabianofranz

@liggitt liggitt Awaiting requested review from liggitt

Assignees

@mfojtik mfojtik

Labels
kind/bug Categorizes issue or PR as related to a bug. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@juanvallejo @openshift-bot @openshift-merge-robot @fabianofranz @mfojtik @openshift-ci-robot