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.14] OCPBUGS-31621: add check for taint.value == nil #294

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #293

/assign sreber84

This change adds an extra check to ensure that the `value` field is not
nil.
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-31464 has been cloned as Jira Issue OCPBUGS-31621. Will retitle bug to link to clone.
/retitle [release-4.14] OCPBUGS-31621: add check for taint.value == nil

In response to this:

This is an automated cherry-pick of #293

/assign sreber84

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.

@openshift-ci openshift-ci bot changed the title [release-4.14] OCPBUGS-31464: add check for taint.value == nil [release-4.14] OCPBUGS-31621: add check for taint.value == nil Apr 2, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 2, 2024
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-31621, which is invalid:

  • expected dependent Jira Issue OCPBUGS-31464 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

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.

In response to this:

This is an automated cherry-pick of #293

/assign sreber84

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.

@openshift-ci openshift-ci bot requested review from elmiko and JoelSpeed April 2, 2024 11:54
@sreber84
Copy link

sreber84 commented Apr 2, 2024

/assign elmiko

@sreber84 sreber84 removed their assignment Apr 2, 2024
@sreber84
Copy link

sreber84 commented Apr 2, 2024

/assign JoelSpeed

@elmiko
Copy link

elmiko commented Apr 2, 2024

/approve
/lgtm
/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 Apr 2, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 2, 2024
Copy link

openshift-ci bot commented Apr 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 2, 2024
Copy link

openshift-ci bot commented Apr 2, 2024

@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.

@sunzhaohua2
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 3, 2024
@sreber84
Copy link

sreber84 commented Apr 3, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 3, 2024
@openshift-ci-robot
Copy link

@sreber84: This pull request references Jira Issue OCPBUGS-31621, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-31464 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-31464 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • bug has dependents

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

/jira 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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from sunzhaohua2 April 3, 2024 07:49
@sreber84
Copy link

sreber84 commented Apr 3, 2024

/cherry-pick release-4.13

@openshift-cherrypick-robot
Copy link
Author

@sreber84: 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.

In response to this:

/cherry-pick release-4.13

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-merge-bot openshift-merge-bot bot merged commit 9d87281 into openshift:release-4.14 Apr 3, 2024
12 checks passed
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-31621: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-31621 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #293

/assign sreber84

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.

@openshift-cherrypick-robot
Copy link
Author

@sreber84: #294 failed to apply on top of branch "release-4.13":

Applying: UPSTREAM: <carry>: add check for taint.value == nil
Using index info to reconstruct a base tree...
M	cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller_test.go
M	cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured.go
M	cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured_test.go
Falling back to patching base and 3-way merge...
Auto-merging cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured_test.go
CONFLICT (content): Merge conflict in cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured_test.go
Auto-merging cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured.go
Auto-merging cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller_test.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 UPSTREAM: <carry>: add check for taint.value == nil
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.13

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.

@elmiko
Copy link

elmiko commented Apr 3, 2024

i'll manually open a PR for 4.13

@elmiko
Copy link

elmiko commented Apr 3, 2024

created #295

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-vertical-pod-autoscaler-container-v4.14.0-202404031211.p0.g9d87281.assembly.stream.el8 for distgit vertical-pod-autoscaler.
All builds following this will include this PR.

@openshift-merge-robot
Copy link

Fix included in accepted release 4.14.0-0.nightly-2024-04-04-014015

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet