[release-4.16] OCPBUGS-32887: Delete and recreate canary route to clear spec.host#1099
Conversation
openshift-ci-robot
added
jira/severity-moderate
|
@Miciah: This pull request references Jira Issue OCPBUGS-32887, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
Miciah
changed the title
Miciah
changed the title
|
/jira refresh |
|
@Miciah: This pull request references Jira Issue OCPBUGS-32887, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
Fix the update logic for the canary route to handle clearing spec.host. Attempts to clear spec.host using a simple update may be ignored[1]. Therefore it is necessary to delete and recreate the route. 1. openshift/origin@54c072c Before this commit, the operator would set spec.subdomain, but it did not actually clear spec.host, and so setting spec.subdomain had no effect. After this commit, the operator should clear spec.host, and spec.subdomain should be in effect. Follow-up to commit 77c61ba. This commit is related to OCPBUGS-36465. https://issues.redhat.com/browse/OCPBUGS-36465 * pkg/operator/controller/canary/route.go (updateCanaryRoute): Delete and recreate the route in order to clear spec.host. (deleteCanaryRoute): Add an options parameter for updateCanaryRoute to use. * test/e2e/canary_test.go (TestCanaryRouteClearsSpecHost): New test. Verify that the operator clears spec.host if it is set on the canary route. * test/e2e/all_test.go (TestAll): Add TestCanaryRouteClearsSpecHost as a serial test.
Miciah
force-pushed
the
cherry-pick-1095-to-release-4.16
branch
from
2e1e6f9 to
2929231
Compare
|
/test e2e-aws-ovn-serial |
|
@Miciah: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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-sigs/prow repository. I understand the commands that are listed here. |
|
/assign |
|
Backport is required because the original bug OCPBUGS-36465 was found in version 4.14 and disrupts upgrades from 4.13 to 4.14. Any risk introduced by this fix is balanced against the improvement in the success of 4.14 upgrades. /label backport-risk-assessed |
openshift-ci
bot
added
the
backport-risk-assessed
|
Dependency on #1095 |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: candita The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/tide refresh |
|
/label cherry-pick-approved |
openshift-ci
bot
added
the
cherry-pick-approved
|
/jira refresh |
|
@candita: This pull request references Jira Issue OCPBUGS-32887, which is invalid:
Comment DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
/jira refresh |
|
@candita: This pull request references Jira Issue OCPBUGS-32887, which is invalid:
Comment DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
Using the pre-image build,
hence marking the bugs are verified |
openshift-ci
bot
added
the
qe-approved
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@melvinjoseph86: This pull request references Jira Issue OCPBUGS-32887, which is valid. 7 validation(s) were run on this bug
Requesting review from QA contact: DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
@Miciah: Jira Issue OCPBUGS-32887: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-32887 has been moved to the MODIFIED state. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
[ART PR BUILD NOTIFIER] This PR has been included in build ose-cluster-ingress-operator-container-v4.16.0-202407121806.p0.gaf5d3f6.assembly.stream.el9 for distgit ose-cluster-ingress-operator. |
|
Fix included in accepted release 4.16.0-0.nightly-2024-07-13-011932 |
8 participants
Fix the update logic for the canary route to handle clearing
spec.host. Attempts to clearspec.hostusing a simple update may be ignored (see openshift/origin@54c072c). Therefore it is necessary to delete and recreate the route.Before this change, the operator would set
spec.subdomain, but it did not actually clearspec.host, and so settingspec.subdomainhad no effect.After this change, the operator should clear
spec.host, andspec.subdomainshould be in effect.Follow-up to #1047.
This is manual cherry-pick of #1095. #978 added the
TestCanaryWithMTLStest totest/e2e/all_test.goin the release-4.17 branch, and this test is not in the release-4.16 branch, so it caused a conflict for this backport that required manual resolution.