console
console copied to clipboard
[release-4.9] Bug 2117608: use the correct Alertmanager tenancy proxy
Manual cherry-pick of https://github.com/openshift/console/pull/11418
@vikram-raj: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh
.
In response to this:
[release-4.9]: use the correct Alertmanager tenancy proxy
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.
@vikram-raj: This pull request references Bugzilla bug 2117608, which is invalid:
- expected Bugzilla bug 2117608 to depend on a bug targeting a release in 4.10.0, 4.10.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found
Comment /bugzilla refresh
to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.
In response to this:
[release-4.9] Bug 2117608: use the correct Alertmanager tenancy proxy
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.
/bugzilla refresh
@vikram-raj: This pull request references Bugzilla bug 2117608, which is invalid:
- expected Bugzilla bug 2117608 to depend on a bug targeting a release in 4.10.0, 4.10.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found
Comment /bugzilla refresh
to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.
In response to this:
/bugzilla refresh
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.
/bugzilla refresh
@vikram-raj: This pull request references Bugzilla bug 2117608, 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 2079985 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
- dependent Bugzilla bug 2079985 targets the "4.10.z" release, which is one of the valid target releases: 4.10.0, 4.10.z
- bug has dependents
Requesting review from QA contact: /cc @sanketpathak
In response to this:
/bugzilla refresh
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.
/cherry-pick release-4.8
@vikram-raj: 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.
/retest
/retest
/lgtm /label backport-risk-assessed
Verified the changes and works as expected
/assign @jhadvig
/cc @sanketpathak
/label cherry-pick-approved
/cherry-pick release-4.8
@invincibleJai: 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.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: invincibleJai, jhadvig, vikram-raj
The full list of commands accepted by this bot can be found here.
The pull request process is described here
- ~~frontend/packages/dev-console/OWNERS~~ [invincibleJai,jhadvig]
- ~~pkg/OWNERS~~ [jhadvig]
Approvers can indicate their approval by writing /approve
in a comment
Approvers can cancel approval by writing /approve cancel
in a comment
/retest
/retest-required
Remaining retests: 0 against base HEAD 7bc63f841052c0e4129ab2558b56c288f6028d76 and 2 for PR HEAD 3ee644d3ab625535314e39d3e042a3bd57cdfcd3 in total
/retest
@vikram-raj: 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.
@vikram-raj: All pull requests linked via external trackers have merged:
Bugzilla bug 2117608 has been moved to the MODIFIED state.
In response to this:
[release-4.9] Bug 2117608: use the correct Alertmanager tenancy proxy
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.
@invincibleJai: #11954 failed to apply on top of branch "release-4.8":
Applying: use the correct Alertmanager tenancy proxy
Using index info to reconstruct a base tree...
M frontend/packages/dev-console/locales/en/devconsole.json
M frontend/packages/dev-console/src/components/monitoring/alerts/MonitoringAlerts.tsx
M frontend/packages/dev-console/src/components/monitoring/alerts/SilenceAlert.tsx
M frontend/packages/dev-console/src/components/monitoring/alerts/SilenceDurationDropdown.tsx
M frontend/packages/dev-console/src/components/monitoring/alerts/monitoring-alerts-utils.tsx
M pkg/server/server.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/server/server.go
Auto-merging frontend/packages/dev-console/src/components/monitoring/alerts/monitoring-alerts-utils.tsx
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/monitoring/alerts/monitoring-alerts-utils.tsx
Auto-merging frontend/packages/dev-console/src/components/monitoring/alerts/SilenceDurationDropdown.tsx
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/monitoring/alerts/SilenceDurationDropdown.tsx
Auto-merging frontend/packages/dev-console/src/components/monitoring/alerts/SilenceAlert.tsx
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/monitoring/alerts/SilenceAlert.tsx
Auto-merging frontend/packages/dev-console/src/components/monitoring/alerts/MonitoringAlerts.tsx
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/monitoring/alerts/MonitoringAlerts.tsx
Auto-merging frontend/packages/dev-console/locales/en/devconsole.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 use the correct Alertmanager tenancy proxy
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.