Support web console image for cluster up #17575

spadgett · 2017-12-04T15:40:28Z

Install and run the web console server from a template during cluster up. Requires the proxy from #17862 to actually use the console server.

@deads2k @jwforres

jwforres · 2017-12-04T16:01:20Z

so this also depends on https://github.com/openshift/aos-cd-jobs/pull/904/files

bparees · 2017-12-04T16:27:57Z

please add a test (or enhance an existing test) in clusterup.sh that confirms the web console is working.

jwforres · 2017-12-04T16:20:55Z

install/origin-web-console/console-template.yaml

+  name: openshift-web-console
+  annotations:
+    openshift.io/display-name: OpenShift Web Console
+    description: The API server for the OpenShift web console.


remove "API"

spadgett · 2017-12-04T17:05:01Z

please add a test (or enhance an existing test) in clusterup.sh that confirms the web console is working.

Thanks, I added a basic test for the console.

bparees · 2017-12-04T17:06:44Z

test/extended/clusterup.sh

+function os::test::extended::clusterup::verify_console () {
+    os::cmd::expect_success "oc login -u system:admin"
+    os::cmd::expect_success_and_text "oc get svc -n openshift-web-console" "webconsole"
+	os::cmd::try_until_text "oc get endpoints webconsole -o jsonpath='{ .subsets[*].ports[?(@.name==\"https\")].port }' -n openshift-web-console" "8443" $(( 10*minute )) 1


spadgett · 2017-12-05T18:22:37Z

/retest

spadgett · 2017-12-05T21:06:42Z

I believe the cluster up tests are failing because there's no v3.9.0-alpha.0 console image.

spadgett · 2017-12-06T13:41:06Z

Rebased for #17338

@bparees For now, I special cased the console tests not to run N-1 since it is only for 3.9. We might have the same problem again down the road when we add new features. Let me know if you can think of a cleaner way to handle it.

bparees · 2017-12-06T14:15:06Z

pkg/oc/bootstrap/docker/up.go

+	// for the web console
+	consoleTemplateLocations = map[string]string{
+		"web console server template": "install/origin-web-console/console-template.yaml",
+	}


any reason you didn't just put this in the "internalCurrentTemplateLocations" array?
(the comments about it only being used w/ the service catalog is requested are inaccurate, you can clean them up :) )

Right now the template is only imported on 3.9+ clusters, which is why it's in a separate map. We could always import it, though.

OK I see internalCurrentTemplateLocations only installs in 3.9. I'll update.

bparees · 2017-12-06T14:18:46Z

pkg/oc/bootstrap/docker/up.go

@@ -1040,6 +1094,10 @@ func useAnsible(v semver.Version) bool {
 	return v.GTE(openshiftVersion36)
 }

+func useWebConsoleTemplate(v semver.Version) bool {
+	return v.GTE(openshiftVersion39)


you can use v.GT(openshiftVersion37) instead to avoid introducing yet another version number constant.

It's not clear to me looking at the doc if that will return true for 3.7.1?

https://godoc.org/github.com/blang/semver#Version.GT

I might need to make this greater than v3.9.0-alpha.0 to avoid the extended test failures.

it should return true for 3.7.1.

it should return true for 3.7.1.

Cluster up will fail if it tries to use the web console image for 3.7.1 since the image doesn't exist.

ok well all the "current/previous" logic is impacted by that. so it should all be updated to check for 3.9.

bparees · 2017-12-06T14:21:23Z

test/extended/clusterup.sh

+    if [ "$test" == "console" ]; then
+        cleanup_func=$("os::test::extended::clusterup::cleanup_func" "${test}")
+        # trap "${cleanup_func}; os::test::extended::clusterup::junit_cleanup" EXIT
+        os::test::extended::clusterup::run_test "${test}" "--loglevel=2"


pass the --version here instead of hardcoding it in your test. that way when someone removes this special case things will "just work" the way they're supposed to.

deads2k · 2018-01-08T13:17:27Z

install/origin-web-console/console-template.yaml

+              path: /healthz
+              port: 8443
+              scheme: HTTPS
+        nodeSelector: "${{NODE_SELECTOR}}"


What do double curlies do?

It lets you use values that aren't strings.

https://docs.openshift.org/latest/dev_guide/templates.html#writing-parameters

When using the ${{PARAMETER_NAME}} syntax only a single parameter reference is allowed and leading/trailing characters are not permitted. The resulting value will be unquoted unless, after substitution is performed, the result is not a valid json object. If the result is not a valid json value, the resulting value will be quoted and treated as a standard string.

deads2k · 2018-01-08T13:19:08Z

install/origin-web-console/console-template.yaml

+        volumes:
+        - name: serving-cert
+          secret:
+            defaultMode: 420


Yeah, I've switched it to 0400, which works.

It looks like this was copied from the TSB template. I haven't changed that one.

deads2k · 2018-01-08T13:22:37Z

Still a WIP?

spadgett · 2018-01-08T14:16:00Z

@deads2k thanks, updated

spadgett · 2018-01-08T15:31:33Z

/retest

spadgett · 2018-01-08T17:40:43Z

/retest

deads2k · 2018-01-08T18:16:50Z

/lgtm

openshift-ci-robot · 2018-01-08T18:16:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, spadgett

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~~ [deads2k]

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

spadgett · 2018-01-08T20:50:26Z

@deads2k The e2e tests were failing because there no was console image tagged with the origin commit for cluster up. I have a PR open in aos-cd-jobs to build the image for the e2e tests like the image registry container image.

openshift-eng/aos-cd-jobs#982

I added a second commit to this PR that tags origin-web-console:latest as the origin commit, for the moment anyway.

@stevekuznetsov FYI

spadgett · 2018-01-09T13:27:22Z

flake #17529

/retest

Update the web console template based on changes in openshift/origin#17575

spadgett · 2018-01-09T17:32:09Z

/test unit

spadgett · 2018-01-09T19:25:14Z

/retest

spadgett · 2018-01-09T23:33:41Z

It looks like the cluster failed to provision in the conformance gce tests

/retest

openshift-merge-robot · 2018-01-10T03:04:42Z

Automatic merge from submit-queue.

@sdodson

Automatic merge from submit-queue. Update web console template Update the web console template based on changes in openshift/origin#17575 /assign @sdodson @deads2k fyi

Update the web console template based on changes in openshift/origin#17575

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 Dec 4, 2017

openshift-ci-robot requested review from bparees and smarterclayton December 4, 2017 15:40

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

jwforres reviewed Dec 4, 2017

View reviewed changes

spadgett force-pushed the console-cluster-up branch 2 times, most recently from 4503b9d to a9d4110 Compare December 4, 2017 17:04

bparees reviewed Dec 4, 2017

View reviewed changes

spadgett force-pushed the console-cluster-up branch 2 times, most recently from 310a478 to 089f736 Compare December 4, 2017 18:19

spadgett mentioned this pull request Dec 5, 2017

Install web console server openshift/openshift-ansible#6359

Merged

10 tasks

spadgett force-pushed the console-cluster-up branch from 089f736 to f6fc7e8 Compare December 5, 2017 19:27

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

spadgett force-pushed the console-cluster-up branch from f6fc7e8 to 2ace611 Compare December 6, 2017 13:25

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

bparees requested changes Dec 6, 2017

View reviewed changes

spadgett force-pushed the console-cluster-up branch 6 times, most recently from 37586fa to fe38017 Compare December 13, 2017 15:03

spadgett force-pushed the console-cluster-up branch 2 times, most recently from 5813b35 to d3c9541 Compare December 13, 2017 16:51

deads2k reviewed Jan 8, 2018

View reviewed changes

spadgett changed the title ~~[WIP] support web console image for cluster up~~ Support web console image for cluster up Jan 8, 2018

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 Jan 8, 2018

Support web console image for cluster up

caba0dc

spadgett force-pushed the console-cluster-up branch from 7611157 to caba0dc Compare January 8, 2018 14:14

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 8, 2018

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 8, 2018

Tag origin-web-console image for e2e tests

27041dd

openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 8, 2018

spadgett added the lgtm Indicates that a PR is ready to be merged. label Jan 8, 2018

spadgett added a commit to spadgett/openshift-ansible that referenced this pull request Jan 9, 2018

Update web console template

0cfe0b7

Update the web console template based on changes in openshift/origin#17575

spadgett added a commit to spadgett/openshift-ansible that referenced this pull request Jan 9, 2018

Update web console template

75f245f

Update the web console template based on changes in openshift/origin#17575

spadgett mentioned this pull request Jan 9, 2018

Update web console template openshift/openshift-ansible#6665

Merged

openshift-merge-robot merged commit a027e96 into openshift:master Jan 10, 2018

spadgett deleted the console-cluster-up branch January 11, 2018 01:10

leseb pushed a commit to leseb/openshift-ansible that referenced this pull request Dec 14, 2018

Update web console template

ac76893

Update the web console template based on changes in openshift/origin#17575

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support web console image for cluster up #17575

Support web console image for cluster up #17575

spadgett commented Dec 4, 2017 •

edited

Loading

jwforres commented Dec 4, 2017

bparees commented Dec 4, 2017

jwforres Dec 4, 2017

spadgett commented Dec 4, 2017

bparees Dec 4, 2017

spadgett commented Dec 5, 2017

spadgett commented Dec 5, 2017

spadgett commented Dec 6, 2017

bparees Dec 6, 2017

spadgett Dec 6, 2017

spadgett Dec 6, 2017

bparees Dec 6, 2017

spadgett Dec 6, 2017

bparees Dec 6, 2017

spadgett Dec 6, 2017

bparees Dec 6, 2017

bparees Dec 6, 2017

deads2k Jan 8, 2018

spadgett Jan 8, 2018

deads2k Jan 8, 2018

deads2k Jan 8, 2018

spadgett Jan 8, 2018

deads2k commented Jan 8, 2018

spadgett commented Jan 8, 2018

spadgett commented Jan 8, 2018

spadgett commented Jan 8, 2018

deads2k commented Jan 8, 2018

openshift-ci-robot commented Jan 8, 2018

spadgett commented Jan 8, 2018

spadgett commented Jan 9, 2018

spadgett commented Jan 9, 2018

spadgett commented Jan 9, 2018

spadgett commented Jan 9, 2018

openshift-merge-robot commented Jan 10, 2018

Support web console image for cluster up #17575

Support web console image for cluster up #17575

Conversation

spadgett commented Dec 4, 2017 • edited Loading

jwforres commented Dec 4, 2017

bparees commented Dec 4, 2017

Choose a reason for hiding this comment

spadgett commented Dec 4, 2017

Choose a reason for hiding this comment

spadgett commented Dec 5, 2017

spadgett commented Dec 5, 2017

spadgett commented Dec 6, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

deads2k commented Jan 8, 2018

spadgett commented Jan 8, 2018

spadgett commented Jan 8, 2018

spadgett commented Jan 8, 2018

deads2k commented Jan 8, 2018

openshift-ci-robot commented Jan 8, 2018

spadgett commented Jan 8, 2018

spadgett commented Jan 9, 2018

spadgett commented Jan 9, 2018

spadgett commented Jan 9, 2018

spadgett commented Jan 9, 2018

openshift-merge-robot commented Jan 10, 2018

spadgett commented Dec 4, 2017 •

edited

Loading