-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
Rebase service catalog to v0.0.17 #16150
Rebase service catalog to v0.0.17 #16150
Conversation
/lgtm |
/retest Please review the full test history for this PR and help us cut down flakes. |
/test extended_conformance_gce |
/retest Please review the full test history for this PR and help us cut down flakes. |
/lgtm cancel |
@jpeeler we need to ensure that:
We'll also need a follow-up after this to update the ansible installer. |
I built images with this PR in attempt to use the updated service catalog but I am seeing an error from
Edit: I had to use a newer oc. Now I am getting:
which looks similar to our Broker before we updated the kind. I think I know where to fix this. I'll add a note if my test works. |
@jmontleon This PR was canceled for merging because it's not ready to go after all. One problem that needs fixing is the kind in the template-service-broker-registration needs to be changed to ServiceBroker. There may be additional renames required as well (since broker is not the only name change that occurred in 0.0.17). |
@jpeeler @spadgett I had some luck getting APB's to at least launch with additional changes. origin-web-common: https://github.com/jmontleon/origin-web-common/commit/33a85c42b13402f53ebd458066f306665368afaa With all that I updated the assets in origin, modified https://github.com/openshift/origin/blob/master/install/service-catalog-broker-resources/template-service-broker-registration.yaml#L13 to read ServiceBroker, and ran make update. I also had to update the service catalog to newer than what's currently in the origin repo, but I have not had much luck following the sync documentation to share my overall changes just yet. None of this addresses binds. |
@jmontleon My PR should address binding, but I need to test: |
…service-catalog/' changes from 7e650e7e39..ef63307bdb ef63307bdb origin build: add origin tooling a876fe3 v0.0.17 (openshift#1178) c5237fe correct osbapi service definition (openshift#1177) 6036d4e Adding walkthrough instructions for 1.7 (openshift#1171) 5f111dd Specifying that you need Helm v2.5.0 for installation (openshift#1170) 08043bd Adding more small fixes to the walkthrough & install docs (openshift#1169) d65d4a1 rbac targets needed to be renamed as well (openshift#1161) 590f6f2 Write helm command to file for api aggregation (openshift#1141) 49ddcf6 clean before building a specific arch (openshift#1168) 43f7cfb Splitting up the Walkthrough for 1.6 and 1.7 instructions (openshift#1163) 02e0217 Updates to README (openshift#1166) 57f2aa5 Adding instructions for installing from Macs (openshift#1164) dfe620e fix rate-limiting for polling queue (openshift#1143) ca5f335 Use Generation instead of checksum for Broker (openshift#1145) 5364daa Merge branch 'pr/1158' f34c5db move Travis deployment script to directory in 'contrib/' 2a00d7f Update incorrect port (openshift#1156) b0ed60e improve the repository's layout (openshift#1154) f870baf Follow up file / renames from openshift#1142 (openshift#1152) 826b4f9 remove unnecessary json annotations (openshift#1153) 33cb345 Rename resources. closes openshift#1080 (openshift#1142) 70c2b9b Add ability to specify CA certs to use for TLS authentication. (openshift#1112) 2aa5039 v0.0.16 (openshift#1140) 65de49c Comments for unit test bullet proofing (openshift#1139) REVERT: 7e650e7e39 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: ef63307bdbaa64efca204912f5361a4f3d3be2c8
0589d32
to
a94bc00
Compare
@spadgett has told me in person that this PR worked well for him. /lgtm |
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jpeeler, pmorie, smarterclayton 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 |
/retest |
@jpeeler @pmorie any insight into why we're still getting errors when the controller-manager tries to communicate with the ansible service broker over SSL?
|
Even with SSL disabled I also see errors that are preventing APB's and other apps from being properly populated in the UI.
Edit: disregard this. It is working for me if I disabled SSL on the broker. |
/retest Please review the full test history for this PR and help us cut down flakes. |
2 similar comments
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest |
flake #16312 |
/retest |
Automatic merge from submit-queue (batch tested with PRs 16150, 16284, 16296, 16071) |
This rebases service catalog to the latest release.