Skip to content

Sync catalog v0.1.0-rc1#16783

Merged
openshift-merge-robot merged 4 commits intoopenshift:masterfrom
jboyd01:sync-catalog-1.1rc1
Oct 11, 2017
Merged

Sync catalog v0.1.0-rc1#16783
openshift-merge-robot merged 4 commits intoopenshift:masterfrom
jboyd01:sync-catalog-1.1rc1

Conversation

@jboyd01
Copy link

@jboyd01 jboyd01 commented Oct 10, 2017 •
edited
Loading

syncing Service Catalog v0.1.0rc1 to Origin

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 10, 2017
@jboyd01
Copy link
Author

jboyd01 commented Oct 10, 2017

/test service-catalog

@pmorie pmorie changed the title WIP - Sync catalog 1.1rc1 WIP - Sync catalog v0.1.0-rc1 Oct 10, 2017
@spadgett
Copy link
Member

spadgett commented Oct 10, 2017

@jboyd01 FYI, you'll probably also need to update

https://github.com/openshift/origin/blob/master/install/service-catalog-broker-resources/template-service-broker-registration.yaml#L12-L13

for the name change.

Jay Boyd added 2 commits October 10, 2017 15:43
Squashed 'cmd/service-catalog/go/src/github.com/kubernetes-incubator/…
46dccda 
…service-catalog/' changes from 7011d9e816..3aacfedec6

3aacfedec6 carry: Set external plan name for service-catalog walkthrough
3ec9e5b07a origin build: add origin tooling
8bb631f v0.1.0-rc1 chart updates (openshift#1359)
400e37f Move API to v1beta1 (openshift#1356)
8f55a99 0.0.24 chart updates (openshift#1357)
7ebb8ae Rename Service[Broker|Class|Plan]Status => ClusterService... (openshift#1349)
82a6103 Detect removed catalog entries (openshift#1353)
85125fd Refactor instance spec (openshift#1350)
99c0644 Update to Kubernetes 1.8 (openshift#1334)
a537490 Reformatting printed messages for controller_instance (openshift#1341)
0763ac0 Use field selector for broker delete (openshift#1348)
93fb0e5 remaining renames from ServiceInstanceCredential to ServiceBinding (openshift#1347)
cfdb2ed add text about how updating secrets/params require a 'poke' (openshift#1337)
1d04776 Change PresentInCatalog -> MissingFromBrokerCatalog (openshift#1342)
c95309c Update Service[Broker|Class|Plan] to ClusterService[Broker|Class|Plan] (openshift#1345)
9365039 Fix controller binding queue name, update documents (openshift#1344)
6375eb3 Do not set Ready/False condition in API Server when updating an instance. (openshift#1335)
108f05d Merge branch 'pr/1340'
bd0cb7b gofmt
e0ce4b5 Jenkins modifications
9341cbf unit and integration tests pass
076bfb2 Disambiguate k8s and external names in log messages for broker (openshift#1336)
c59e1e5 types.go changes for review
4ceaaab Rename resources from Service[Class|Plan]  to ClusterService[Class|Plan] (openshift#1327)
556c7d8 Add status.presentInCatalog field to service/plan (openshift#1328)
a6ad96a openshift#1148: Support updates to Instances (openshift#1289)
e36d286 fix RBAC resource names for ClusterServiceBroker (openshift#1330)
78d09ae add timeout (openshift#1326)
92ac8b5 Address comments raised after 1305 was merged (openshift#1321)
aca7543 Rename ServiceBroker to ClusterServiceBroker (openshift#1319)
a2b6ac0 Implementation for binding orphan mitigation (openshift#1241)
bffe4de Chart updates for 0.0.23 release (openshift#1325)
REVERT: 7011d9e816 origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: 3aacfedec6f8d3d07a5b922e0fcd4a9b28a0e5d2
Merge version v0.1.0-rc1 of Service Catalog from https://github.com/o…
048cccc 
…penshift/service-catalog:v0.1.0-rc1+origin
@jboyd01 jboyd01 force-pushed the sync-catalog-1.1rc1 branch from 8d08424 to 3d1d19f Compare October 10, 2017 19:58
@jboyd01
Copy link
Author

jboyd01 commented Oct 10, 2017

/test service-catalog

@pmorie
Copy link
Contributor

pmorie commented Oct 10, 2017 •
edited
Loading

You'll need to change the API version in the apiservice resource which is hard-coded here:

https://github.com/openshift/origin/blob/master/pkg/oc/bootstrap/docker/openshift/servicecatalog.go#L132

I think we ought to consider moving this into the template (in a follow-up) - it's not clear to me why this is embedded in the code.

@jboyd01 jboyd01 force-pushed the sync-catalog-1.1rc1 branch 2 times, most recently from 659e75f to be274a2 Compare October 10, 2017 21:11
@jboyd01
Copy link
Author

jboyd01 commented Oct 10, 2017

/test service-catalog

@jboyd01 jboyd01 force-pushed the sync-catalog-1.1rc1 branch from be274a2 to e4276f9 Compare October 11, 2017 00:22
@jboyd01
Copy link
Author

jboyd01 commented Oct 11, 2017

/test service-catalog

@jboyd01 jboyd01 changed the title WIP - Sync catalog v0.1.0-rc1 Sync catalog v0.1.0-rc1 Oct 11, 2017
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 11, 2017
@jboyd01
Copy link
Author

jboyd01 commented Oct 11, 2017

/test extended_conformance_gce

@pmorie
Copy link
Contributor

pmorie commented Oct 11, 2017

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 11, 2017
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 11, 2017

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jboyd01, pmorie

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

Details 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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 11, 2017
@spadgett spadgett mentioned this pull request Oct 11, 2017
Merged
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 11, 2017

Automatic merge from submit-queue (batch tested with PRs 16725, 16779, 16798, 16783, 16740).

@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 11, 2017

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Oct 11, 2017

Automatic merge from submit-queue (batch tested with PRs 16725, 16779, 16798, 16783, 16740).

@openshift-merge-robot openshift-merge-robot merged commit 85a99b8 into openshift:master Oct 11, 2017
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 11, 2017 •
edited
Loading

@jboyd01: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/experimental/unit e4276f9 link /test origin-ut
ci/openshift-jenkins/extended_conformance_gce e4276f9 link /test extended_conformance_gce

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

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. I understand the commands that are listed here.

@jim-minter jim-minter mentioned this pull request Oct 18, 2017
Closed
@jboyd01 jboyd01 deleted the sync-catalog-1.1rc1 branch October 19, 2017 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@pmorie pmorie

@jpeeler jpeeler

@smarterclayton smarterclayton

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. needs-api-review size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@jboyd01 @spadgett @pmorie @openshift-merge-robot @openshift-ci-robot @jpeeler @smarterclayton