Revise branding mechanism for Console Operator by zherman0 · Pull Request #180 · openshift/console-operator

zherman0 · 2019-03-19T14:59:05Z

Update the default behavior of branding so that the one and only docker file now builds ocp instead of okd.
If the user instead wants to manually build openshift with go build or make build, that process will default to okd.

zherman0 · 2019-03-19T14:59:58Z

/assign @benjaminapetersen @spadgett

benjaminapetersen · 2019-03-19T15:29:36Z

Thinking now, just to make sure we don't need to worry about docker build as well.

spadgett · 2019-03-19T15:33:34Z

I'd hold off on this change until we are also reading the configmap. Otherwise branding will be wrong for OKD.

spadgett · 2019-03-19T15:36:20Z

We should be able remove Dockerfile.rhel7 after this, but probably need to coordinate with ART

benjaminapetersen · 2019-03-19T18:40:09Z

@zherman0 are you doing the configmap as part of this PR, or separate?I imagine that part might need to come first.

spadgett · 2019-03-19T19:50:52Z

/hold

Adding a hold to make sure we read the console-config config map in openshift-config-managed before going ahead with the Dockerfile changes.

zherman0 · 2019-03-20T19:55:36Z

I was breaking things into smaller parts for my PRs, but since the configmap and this change are tightly coupled, I will put everything into this PR. For now I will set this as WIP.

zherman0 · 2019-04-03T00:28:30Z

/test e2e-aws

spadgett · 2019-04-12T11:19:46Z

/retest

spadgett · 2019-04-12T12:46:39Z

/hold cancel

spadgett · 2019-04-12T13:09:18Z

/retest

spadgett · 2019-04-12T13:10:38Z

The test flakes we're seeing should be fixed by openshift/origin#22543

spadgett · 2019-04-12T15:18:46Z

/retest

zherman0 · 2019-04-12T16:39:34Z

@spadgett @benjaminapetersen - New unit tests added and commits squashed

benjaminapetersen

1 rbac & a couple other qs, close!

zherman0 · 2019-04-13T00:54:10Z

/test e2e-aws

zherman0 · 2019-04-13T01:03:03Z

/test e2e-aws

benjaminapetersen · 2019-04-15T15:16:27Z

/lgtm

We should get an e2e test for this as I expect we will not manually test it often. Created https://jira.coreos.com/browse/CONSOLE-1385 to track.

openshift-ci-robot · 2019-04-15T15:17:16Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benjaminapetersen, zherman0

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [benjaminapetersen]

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 added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 19, 2019

openshift-ci-robot requested review from enj and spadgett March 19, 2019 14:59

openshift-ci-robot assigned benjaminapetersen and spadgett Mar 19, 2019

spadgett reviewed Mar 19, 2019

View reviewed changes

Comment thread Dockerfile Outdated

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

spadgett mentioned this pull request Mar 20, 2019

Rename Dockerfile.rhel7 -> Dockerfile.rhel #158

Closed

1 task

zherman0 changed the title ~~Make normal dockerfile default to ocp~~ [WIP] Make normal dockerfile default to ocp Mar 20, 2019

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 Mar 20, 2019

zherman0 changed the title ~~[WIP] Make normal dockerfile default to ocp~~ [WIP] Revise branding mechanism for Console Operator Mar 25, 2019

zherman0 force-pushed the brand2 branch from 55562dc to 4943aec Compare March 28, 2019 14:48

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 2, 2019

zherman0 force-pushed the brand2 branch from 4943aec to e869f7c Compare April 2, 2019 14:34

openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 2, 2019

zherman0 force-pushed the brand2 branch from 15feb90 to a96717d Compare April 2, 2019 23:13

zherman0 changed the title ~~[WIP] Revise branding mechanism for Console Operator~~ Revise branding mechanism for Console Operator Apr 2, 2019

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 Apr 2, 2019

benjaminapetersen reviewed Apr 3, 2019

View reviewed changes

Comment thread manifests/03-rbac-role-ns-openshift-config-managed.yaml Outdated

benjaminapetersen reviewed Apr 3, 2019

View reviewed changes

Comment thread manifests/04-rbac-rolebinding.yaml Outdated

zherman0 force-pushed the brand2 branch from 47b2251 to ebf5f8d Compare April 10, 2019 17:54

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 10, 2019

zherman0 commented Apr 10, 2019

View reviewed changes

Comment thread manifests/03-rbac-role-ns-operator.yaml Outdated

zherman0 force-pushed the brand2 branch from e0d2d70 to 3366b70 Compare April 10, 2019 18:18

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 10, 2019

spadgett requested changes Apr 10, 2019

View reviewed changes

Comment thread pkg/console/starter/starter.go Outdated

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

zherman0 force-pushed the brand2 branch from 4ffb836 to 2a15957 Compare April 12, 2019 16:35