Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-4.9] Bug 2039681: Fix setting of custom cert for default route #624

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #623

/assign jhadvig

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 12, 2022

@openshift-cherrypick-robot: Bugzilla bug 2037635 has been cloned as Bugzilla bug 2039681. Retitling PR to link against new bug.
/retitle [release-4.9] Bug 2039681: Fix setting of custom cert for default route

In response to this:

[release-4.9] Bug 2037635: Fix setting of custom cert for default route

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.

@openshift-ci openshift-ci bot changed the title [release-4.9] Bug 2037635: Fix setting of custom cert for default route [release-4.9] Bug 2039681: Fix setting of custom cert for default route Jan 12, 2022
@openshift-ci openshift-ci bot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Jan 12, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 12, 2022

@openshift-cherrypick-robot: This pull request references Bugzilla bug 2039681, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.z) matches configured target release for branch (4.9.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 2037635 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 2037635 targets the "4.10.0" release, which is one of the valid target releases: 4.10.0
  • bug has dependents

Requesting review from QA contact:
/cc @yapei

In response to this:

[release-4.9] Bug 2039681: Fix setting of custom cert for default route

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.

@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jan 12, 2022
@jhadvig
Copy link
Member

jhadvig commented Jan 12, 2022

/cherry-pick release-4.8

@openshift-cherrypick-robot
Copy link
Author

@jhadvig: once the present PR merges, I will cherry-pick it on top of release-4.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.8

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.

@yapei
Copy link
Contributor

yapei commented Jan 12, 2022

tested on cluster created via cluster-bot launch 4.9-ci,openshift/console-operator#624, verified that either updating ingress.config or console.operator will take effect, default console route certs will be updated accordingly
Screen Shot 2022-01-12 at 5 59 46 PM
/label qe-approved
/label cherry-pick-approved

@openshift-ci openshift-ci bot added qe-approved Signifies that QE has signed off on this PR cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Jan 12, 2022
@jhadvig
Copy link
Member

jhadvig commented Jan 12, 2022

/retest

1 similar comment
@jhadvig
Copy link
Member

jhadvig commented Jan 17, 2022

/retest

@jhadvig
Copy link
Member

jhadvig commented Jan 17, 2022

/cherry-pick release-4.8

@openshift-cherrypick-robot
Copy link
Author

@jhadvig: once the present PR merges, I will cherry-pick it on top of release-4.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.8

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.

@jhadvig
Copy link
Member

jhadvig commented Jan 18, 2022

/retest

@jhadvig
Copy link
Member

jhadvig commented Jan 19, 2022

/approve

@jhadvig
Copy link
Member

jhadvig commented Jan 19, 2022

/retest

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 19, 2022
Copy link
Member

@jhadvig jhadvig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 19, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 19, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, openshift-cherrypick-robot

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@jhadvig
Copy link
Member

jhadvig commented Jan 24, 2022

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 24, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 24, 2022

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit fdcb82f into openshift:release-4.9 Jan 24, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 24, 2022

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 2039681 has been moved to the MODIFIED state.

In response to this:

[release-4.9] Bug 2039681: Fix setting of custom cert for default route

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.

@openshift-cherrypick-robot
Copy link
Author

@jhadvig: #624 failed to apply on top of branch "release-4.8":

Applying: Bug 2037635: Fix setting of custom cert for default route
Using index info to reconstruct a base tree...
M	pkg/console/controllers/route/controller.go
M	pkg/console/subresource/route/route.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/console/subresource/route/route.go
Auto-merging pkg/console/controllers/route/controller.go
CONFLICT (content): Merge conflict in pkg/console/controllers/route/controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 2037635: Fix setting of custom cert for default route
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.8

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants