Closed openshift-cherrypick-robot closed 8 months ago
@openshift-cherrypick-robot: Jira Issue OCPBUGS-29717 has been cloned as Jira Issue OCPBUGS-30012. Will retitle bug to link to clone. /retitle [release-4.14] OCPBUGS-30012: [4.15] Replace nodelister with master nodelister everywhere
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-30012, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
The bug has been updated to refer to the pull request using the external bug tracker.
@openshift-cherrypick-robot: The following tests failed, say /retest
to rerun all failed tests or /retest-required
to rerun all mandatory failed tests:
Test name | Commit | Details | Required | Rerun command |
---|---|---|---|---|
ci/prow/e2e-gcp-ovn-etcd-scaling | 57100836893b5051a78418b36455714ea1ac6b84 | link | false | /test e2e-gcp-ovn-etcd-scaling |
ci/prow/e2e-aws-etcd-recovery | 57100836893b5051a78418b36455714ea1ac6b84 | link | false | /test e2e-aws-etcd-recovery |
ci/prow/e2e-gcp-qe-no-capabilities | 57100836893b5051a78418b36455714ea1ac6b84 | link | false | /test e2e-gcp-qe-no-capabilities |
Full PR test history. Your PR dashboard.
/cherry-pick release-4.13
@tjungblu: once the present PR merges, I will cherry-pick it on top of release-4.13 in a new PR and assign it to you.
/lgtm /label backport-risk-assessed /retest-required
/jira refresh
@tjungblu: This pull request references Jira Issue OCPBUGS-30012, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @geliu2016
/cherry-pick release-4.13
@tjungblu: once the present PR merges, I will cherry-pick it on top of release-4.13 in a new PR and assign it to you.
/retitle [release-4.14] OCPBUGS-30012: Replace nodelister with master nodelister everywhere
/retest-required
/lgtm /approve
/label cherry-pick-approved
@Elbehery: Can not set label cherry-pick-approved: Must be member in one of these teams: []
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: Elbehery, geliu2016, hasbro17, openshift-cherrypick-robot
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@openshift-cherrypick-robot: Jira Issue OCPBUGS-30012: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-30012 has been moved to the MODIFIED state.
@tjungblu: #1211 failed to apply on top of branch "release-4.13":
Applying: OCPBUGS-29717: Replace nodelister with master nodelister everywhere
Using index info to reconstruct a base tree...
M pkg/etcdenvvar/envvarcontroller.go
M pkg/etcdenvvar/envvarcontroller_test.go
M pkg/etcdenvvar/etcd_env.go
M pkg/operator/etcdcertsigner/etcdcertsignercontroller.go
M pkg/operator/starter.go
M pkg/operator/targetconfigcontroller/targetconfigcontroller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/targetconfigcontroller/targetconfigcontroller.go
Auto-merging pkg/operator/starter.go
CONFLICT (content): Merge conflict in pkg/operator/starter.go
Auto-merging pkg/operator/etcdcertsigner/etcdcertsignercontroller.go
Auto-merging pkg/etcdenvvar/etcd_env.go
CONFLICT (content): Merge conflict in pkg/etcdenvvar/etcd_env.go
Auto-merging pkg/etcdenvvar/envvarcontroller_test.go
Auto-merging pkg/etcdenvvar/envvarcontroller.go
CONFLICT (content): Merge conflict in pkg/etcdenvvar/envvarcontroller.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 OCPBUGS-29717: Replace nodelister with master nodelister everywhere
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".
[ART PR BUILD NOTIFIER]
This PR has been included in build cluster-etcd-operator-container-v4.14.0-202403010609.p0.g2bb59cd.assembly.stream.el8 for distgit cluster-etcd-operator. All builds following this will include this PR.
Fix included in accepted release 4.14.0-0.nightly-2024-03-01-191450
/jira clone
/jira ?
This is an automated cherry-pick of #1206
/assign tjungblu