cluster up support for N-1 clusters #17338

bparees · 2017-11-15T23:54:19Z

switching TSB to its own binary and making sure cluster up can still launch the TSB on older clusters.

supplements/replaces #16800

openshift-merge-robot · 2017-11-15T23:54:39Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees

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

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

~~OWNERS~~ [bparees]

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

bparees · 2017-11-16T00:30:58Z

/unassign @stevekuznetsov @mfojtik
/assign @csrwng @deads2k

guessing the cluster up tests are going to need some tweaking before this all works right.

bparees · 2017-11-16T00:31:40Z

@deads2k and we believe this doesn't need an ansible change because ansible is just instantiating the TSB template, so it gets the change "for free" right?

deads2k · 2017-11-16T13:08:19Z

@deads2k and we believe this doesn't need an ansible change because ansible is just instantiating the TSB template, so it gets the change "for free" right?

@sdodson question to you.

sdodson · 2017-11-16T13:48:27Z

We still need to get the CI jobs in place to automatically sync content from origin to openshift-ansible, but yes that's the intention. I'll see if we can get that in place soon.

Rather than current/previous would it be easier to to just include vX.Y versioned templates?

bparees · 2017-11-16T13:58:34Z

Rather than current/previous would it be easier to to just include vX.Y versioned templates?

we are only supporting N-1, so current/previous makes more sense to me than renaming dirs and changing code every release. This way we just drop the right templates in the right dirs and the rest just works.

bparees · 2017-11-17T15:46:30Z

/retest

bparees · 2017-11-30T17:05:10Z

/retest

deads2k · 2017-11-30T18:28:39Z

/hold

I'd like to land this after we branch for 3.8. I think the last two pulls we need are #17516 and #17357 . I'm double checking now.

bparees · 2017-11-30T23:18:18Z

/retest

deads2k · 2017-12-01T21:43:33Z

/hold cancel
/retest

openshift-bot · 2017-12-02T06:32:35Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2017-12-03T08:45:35Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2017-12-04T08:56:58Z

/retest

Please review the full test history for this PR and help us cut down flakes.

bparees · 2017-12-04T16:29:47Z

/retest

bparees · 2017-12-04T22:01:26Z

@deads2k the new image is failing because the routing doesn't appear to be setup properly:

  <*client.ServerError | 0xc42154ad20>: {
        StatusCode: 500,
        Description: "no matches for /, Kind=Route",
    }
    Internal Server Error: no matches for /, Kind=Route

I1204 20:55:58.536279       1 wrap.go:42] GET /healthz: (5.840178ms) 200 [[kube-probe/1.8] 10.128.0.1:38144]
I1204 20:56:00.824457       1 bind.go:138] Template service broker: Bind: instanceID aadda50d-d92c-402d-bd29-5ed2095aad2c, bindingID fadb6a68-dba5-4138-b9a5-424c79e154a7
I1204 20:56:00.941671       1 route.go:31] Service broker: call to /brokers/template.openshift.io returned no matches for /, Kind=Route
I1204 20:56:00.941996       1 wrap.go:42] PUT /brokers/template.openshift.io/v2/service_instances/aadda50d-d92c-402d-bd29-5ed2095aad2c/service_bindings/fadb6a68-dba5-4138-b9a5-424c79e154a7: (119.958549ms) 500

https://openshift-gce-devel.appspot.com/build/origin-ci-test/pr-logs/pull/17338/test_pull_request_origin_extended_conformance_install/3458/

I can't help but suspect this is related to your part of this change...

bparees · 2017-12-05T20:47:32Z

cmd/template-service-broker/tsb.go

+	_ "k8s.io/kubernetes/pkg/api/install"
+	_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
+	_ "k8s.io/kubernetes/pkg/apis/batch/install"
+	_ "k8s.io/kubernetes/pkg/apis/extensions/install"


@deads2k fyi this was necessary for the TSB to be able to do restmapping successfully. And it seems utterly unsustainable.

openshift-ci-robot · 2017-12-05T23:09:22Z

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

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/extended_conformance_install_update	`d572e4b`	link	`/test extended_conformance_install_update`
ci/openshift-jenkins/extended_conformance_crio	`5d9b047`	link	`/test crio`

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.

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.

bparees · 2017-12-05T23:59:31Z

/retest

openshift-merge-robot · 2017-12-06T03:33:39Z

Automatic merge from submit-queue.

spadgett

I realize this has already merged, but I had a couple comments after rebasing #17575

spadgett · 2017-12-06T16:17:41Z

pkg/oc/bootstrap/docker/up.go

+// brought up matches the client binary being used.  This needs to
+// be updated each release.
+func clusterVersionIsCurrent(v semver.Version) bool {
+	return v.GT(openshiftVersion37)


Won't this return true for 3.7.1?

yeah, good catch, can you address this in your PR? :)

spadgett · 2017-12-06T16:18:19Z

test/extended/clusterup.sh

+    "--loglevel=2"  # can't be empty, so pass something benign
+
+    # Test the code being delivered
+    "--loglevel=2 --version=${ORIGIN_COMMIT}"


ORIGIN_COMMIT shouldn't be used before a default is set

yeah, thanks. i didn't notice since i was only running this in the CI env that always set it. I see you've addressed it in your PR.

openshift-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Nov 15, 2017

openshift-merge-robot assigned stevekuznetsov and mfojtik Nov 15, 2017

openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2017

This was referenced Nov 15, 2017

WIP add N-1 cluster up support deads2k/origin#36

Closed

switch to template-service-broker binary #16800

Closed

bparees force-pushed the tsb_clusterup branch from d783cd2 to ba97b08 Compare November 16, 2017 00:19

openshift-ci-robot assigned csrwng and deads2k and unassigned mfojtik and stevekuznetsov Nov 16, 2017

bparees changed the title ~~cluster up support for N-1 clusters~~ [WIP] cluster up support for N-1 clusters Nov 16, 2017

openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 16, 2017

bparees force-pushed the tsb_clusterup branch 2 times, most recently from 9075af7 to e30d327 Compare November 16, 2017 23:56

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 18, 2017

bparees force-pushed the tsb_clusterup branch 2 times, most recently from 37a57a7 to 3961765 Compare November 19, 2017 00:09

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 19, 2017

bparees force-pushed the tsb_clusterup branch 3 times, most recently from 14b7211 to c550fe4 Compare November 20, 2017 20:57

bparees mentioned this pull request Nov 20, 2017

Limit fail-on-swap override to cluster-up #17385

Merged

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 30, 2017

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 1, 2017

bparees force-pushed the tsb_clusterup branch from 5d9b047 to 164ed0b Compare December 4, 2017 19:55

openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2017

switch to template-service-broker binary

9776370

bparees force-pushed the tsb_clusterup branch from 871e07e to 78da20d Compare December 5, 2017 20:46

bparees commented Dec 5, 2017

View reviewed changes

bparees added the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2017

bparees force-pushed the tsb_clusterup branch from 78da20d to e41a61b Compare December 5, 2017 21:28

openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2017

cluster up support for N-1 clusters

758e387

bparees force-pushed the tsb_clusterup branch from e41a61b to 758e387 Compare December 5, 2017 22:32

bparees added the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2017

openshift-merge-robot merged commit afeda2c into openshift:master Dec 6, 2017

spadgett mentioned this pull request Dec 6, 2017

Support web console image for cluster up #17575

Merged

spadgett reviewed Dec 6, 2017

View reviewed changes

bparees deleted the tsb_clusterup branch December 6, 2017 18:34

ewolinetz mentioned this pull request Dec 11, 2017

Updating tsb image names openshift/openshift-ansible#5726

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cluster up support for N-1 clusters #17338

cluster up support for N-1 clusters #17338

bparees commented Nov 15, 2017 •

edited

Loading

openshift-merge-robot commented Nov 15, 2017

bparees commented Nov 16, 2017

bparees commented Nov 16, 2017

deads2k commented Nov 16, 2017

sdodson commented Nov 16, 2017

bparees commented Nov 16, 2017

bparees commented Nov 17, 2017

bparees commented Nov 30, 2017

deads2k commented Nov 30, 2017

bparees commented Nov 30, 2017

deads2k commented Dec 1, 2017

openshift-bot commented Dec 2, 2017

openshift-bot commented Dec 3, 2017

openshift-bot commented Dec 4, 2017

bparees commented Dec 4, 2017

bparees commented Dec 4, 2017

bparees Dec 5, 2017

openshift-ci-robot commented Dec 5, 2017 •

edited

Loading

bparees commented Dec 5, 2017

openshift-merge-robot commented Dec 6, 2017

spadgett left a comment

spadgett Dec 6, 2017

bparees Dec 6, 2017

spadgett Dec 6, 2017

bparees Dec 6, 2017

cluster up support for N-1 clusters #17338

cluster up support for N-1 clusters #17338

Conversation

bparees commented Nov 15, 2017 • edited Loading

openshift-merge-robot commented Nov 15, 2017

bparees commented Nov 16, 2017

bparees commented Nov 16, 2017

deads2k commented Nov 16, 2017

sdodson commented Nov 16, 2017

bparees commented Nov 16, 2017

bparees commented Nov 17, 2017

bparees commented Nov 30, 2017

deads2k commented Nov 30, 2017

bparees commented Nov 30, 2017

deads2k commented Dec 1, 2017

openshift-bot commented Dec 2, 2017

openshift-bot commented Dec 3, 2017

openshift-bot commented Dec 4, 2017

bparees commented Dec 4, 2017

bparees commented Dec 4, 2017

bparees Dec 5, 2017

Choose a reason for hiding this comment

openshift-ci-robot commented Dec 5, 2017 • edited Loading

bparees commented Dec 5, 2017

openshift-merge-robot commented Dec 6, 2017

spadgett left a comment

Choose a reason for hiding this comment

spadgett Dec 6, 2017

Choose a reason for hiding this comment

bparees Dec 6, 2017

Choose a reason for hiding this comment

spadgett Dec 6, 2017

Choose a reason for hiding this comment

bparees Dec 6, 2017

Choose a reason for hiding this comment

bparees commented Nov 15, 2017 •

edited

Loading

openshift-ci-robot commented Dec 5, 2017 •

edited

Loading