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

allow patching configapi using oc patch #20642

Merged
merged 2 commits into from
Aug 20, 2018

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Aug 14, 2018

Fixes upstream patch and scheme registration to allow oc patch --local -f openshift.local.config/master/master-config.yaml --patch="{\"etcdConfig\": {\"address\": \"${API_HOST}:${ETCD_PORT}\"}}" --loglevel=8 -o yaml

@soltysh @juanvallejo

I think the upstream is out of date
/hold

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 14, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k

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-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 17, 2018
@deads2k
Copy link
Contributor Author

deads2k commented Aug 17, 2018

/hold cancel

now in sync with upstream. Also did not add the scheme to oc since all our patches can be done as json patches.

@juanvallejo try basing your fix on this.
@soltysh if it works, let's be nice and announce deprecation of that experimental command.

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 17, 2018
@juanvallejo
Copy link
Contributor

@deads2k

@juanvallejo try basing your fix on this.

#20665

@deads2k
Copy link
Contributor Author

deads2k commented Aug 17, 2018

/retest

@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Aug 20, 2018
@deads2k
Copy link
Contributor Author

deads2k commented Aug 20, 2018

pick merged

@deads2k
Copy link
Contributor Author

deads2k commented Aug 20, 2018

/test extended_conformance_install

@openshift-merge-robot openshift-merge-robot merged commit 70c96cb into openshift:master Aug 20, 2018
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. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants