Ensured to always use a certificate for the router

[aerialls]

This PR is for fixing #5160 to ensured a certificate is always used for the hosted router.

[openshift-bot]

Can one of the admins verify this patch?
I understand the following commands:

• bot, add author to whitelist
• bot, test pull request
• bot, test pull request once

[openshift-bot]

Can one of the admins verify this patch?
I understand the following commands:

• bot, add author to whitelist
• bot, test pull request
• bot, test pull request once

[abutcher]

aos-ci-test

[openshift-bot]

error: aos-ci-jenkins/OS_3.6_NOT_containerized for 470524c (logs)

[openshift-bot]

error: aos-ci-jenkins/OS_3.6_containerized for 470524c (logs)

[abutcher]

aos-ci-test

[openshift-bot]

error: aos-ci-jenkins/OS_3.6_NOT_containerized for 470524c (logs)

[openshift-bot]

error: aos-ci-jenkins/OS_3.6_containerized for 470524c (logs)

[abutcher]

The second CI failure is legitimate. I think this task will need to be moved before the previous since the previous task sets a value for openshift_hosted_router_certificate.

[aerialls]

Indeed! I've reversed the two tasks.

[abutcher]

aos-ci-test

[aerialls]

Tests don't seem to be triggered 🤔

[openshift-bot]

error: aos-ci-jenkins/OS_3.6_containerized for acbdf93 (logs)

[openshift-bot]

success: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for acbdf93 (logs)

[aerialls]

The first failure does not seem to be related to my change.

[aerialls]

Any updates on this one?

Thanks!

[sdodson]

aos-ci-test

[openshift-bot]

error: aos-ci-jenkins/OS_3.6_containerized for acbdf93 (logs)

[openshift-bot]

success: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for acbdf93 (logs)

[abutcher]

aos-ci-test

[openshift-bot]

success: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for acbdf93 (logs)

[openshift-bot]

success: "aos-ci-jenkins/OS_3.6_containerized, aos-ci-jenkins/OS_3.6_containerized_e2e_tests" for acbdf93 (logs)

[abutcher]

[merge]

[sdodson]

[merge]

[openshift-bot]

Evaluated for openshift ansible merge up to acbdf93

[openshift-bot]

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/992/) (Base Commit: b2dfd21) (PR Branch Commit: acbdf93)

[sdodson]

/cherrypick release-3.6

[openshift-cherrypick-robot]

@sdodson: #5162 failed to apply on top of branch "release-3.6":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	roles/openshift_hosted/tasks/router/router.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/openshift_hosted/tasks/router/router.yml
CONFLICT (content): Merge conflict in roles/openshift_hosted/tasks/router/router.yml
Patch failed at 0001 ensured to always use a certificate for the router

In response to this:

/cherrypick release-3.6

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.