Need to add ROUTER_METRICS_TYPE during router upgrades

[sdodson]

@jhadvig has discovered that after upgrading to latest origin e2e tests fail because the router does not export metrics when upgraded from 3.5 to current origin/master. This was a change that was introduced in openshift/origin#13337 and we need to make sure to apply that change during upgrades.

e2e test failure post upgrade https://ci.openshift.redhat.com/jenkins/view/All/job/test_branch_origin_extended_conformance_install_update/154/consoleFull#-81124364856cbb9a5e4b02b88ae8c2f77

Router upgrade happens here but all we do is patch the image version.

https://github.com/openshift/openshift-ansible/blob/master/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml#L12-L42

[sdodson]

openshift/openshift-docs#3779 potential source for other additional changes during upgrade

[stevekuznetsov]

Seems like @smarterclayton should have made this change as part of his patchset

[smarterclayton]

Um... why is router upgrade not rerunning oadm router and merging?

[smarterclayton]

So if the upgrader is just setting the latest image, there are quite a few things that are missing. In which case we probably need to start doing more to actually upgrade users, but it's not inconsistent with our current behavior. My understanding is that online was actually doing something much more, and I assumed that as part of the merge of the ops code we pulled that in.

[sdodson]

I don't believe they were doing anything beyond what we're doing now, @mwoodson can you verify?

@smarterclayton can you show us how you'd re-generate and merge?

[smarterclayton]

Thomas had described to me before, but that may have been manual. Even though we try really hard to be backwards compat, router and registry may deserve to be periodically upgraded (but, we'd have to be sure users wanted that, a la reconcile).

…

On Tue, Apr 4, 2017 at 8:15 PM, Scott Dodson ***@***.***> wrote: I don't believe they were doing anything beyond what we're doing now, @mwoodson <https://github.com/mwoodson> can you verify? @smarterclayton <https://github.com/smarterclayton> can you show us how you'd re-generate and merge? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3845 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABG_p3Xot14gQ5H9oalrM4zH-fjJoqIVks5rsojQgaJpZM4My4lW> .

[openshift-bot]

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

[openshift-bot]

Stale issues rot after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

[openshift-bot]

Rotten issues close after 30d of inactivity.

Reopen the issue by commenting /reopen.
Mark the issue as fresh by commenting /remove-lifecycle rotten.
Exclude this issue from closing again by commenting /lifecycle frozen.

/close

[openshift-ci-robot]

@openshift-bot: Closing this issue.

In response to this:

Rotten issues close after 30d of inactivity.

Reopen the issue by commenting /reopen.
Mark the issue as fresh by commenting /remove-lifecycle rotten.
Exclude this issue from closing again by commenting /lifecycle frozen.

/close

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.