Skip to content

[release-4.12] OCPBUGS-7589: UPSTREAM: <carry>: add default kubelet sysctls within rpm#1478

Merged
openshift-merge-robot merged 1 commit intoopenshift:release-4.12from
openshift-cherrypick-robot:cherry-pick-1475-to-release-4.12
Apr 19, 2023
Merged

[release-4.12] OCPBUGS-7589: UPSTREAM: <carry>: add default kubelet sysctls within rpm#1478
openshift-merge-robot merged 1 commit intoopenshift:release-4.12from
openshift-cherrypick-robot:cherry-pick-1475-to-release-4.12

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #1475

/assign rphillips


@openshift-ci-robot
Copy link
Copy Markdown

@openshift-cherrypick-robot: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@openshift-ci-robot
Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue OCPBUGS-7555 has been cloned as Jira Issue OCPBUGS-7589. Retitling PR to link against new bug.
/retitle [release-4.12] OCPBUGS-7589: UPSTREAM: : add default kubelet sysctls within rpm

Details

In response to this:

This is an automated cherry-pick of #1475

/assign rphillips


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.12] OCPBUGS-7555: UPSTREAM: <carry>: add default kubelet sysctls within rpm [release-4.12] OCPBUGS-7589: UPSTREAM: <carry>: add default kubelet sysctls within rpm Feb 16, 2023
@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 Feb 16, 2023
@openshift-ci-robot
Copy link
Copy Markdown

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

  • expected dependent Jira Issue OCPBUGS-7555 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), 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.

Details

In response to this:

This is an automated cherry-pick of #1475

/assign rphillips


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
Copy link
Copy Markdown

openshift-ci Bot commented Feb 16, 2023

@openshift-cherrypick-robot: 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.

Details

In response to this:

[release-4.12] OCPBUGS-7589: UPSTREAM: : add default kubelet sysctls within rpm

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 requested review from mfojtik and sttts February 16, 2023 12:49
@rphillips
Copy link
Copy Markdown

/bugzilla refresh

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 17, 2023

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

Details

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.

@rphillips
Copy link
Copy Markdown

/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. bugzilla/valid-bug Indicates that a referenced Bugzilla 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 17, 2023
@openshift-ci-robot
Copy link
Copy Markdown

@rphillips: This pull request references Jira Issue OCPBUGS-7589, 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.12.z) matches configured target version for branch (4.12.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-7555 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-7555 targets the "4.13.0" version, which is one of the valid target versions: 4.13.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (schoudha@redhat.com), skipping review request.

Details

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 kubernetes/test-infra repository.

@rphillips
Copy link
Copy Markdown

/retest-required

@rphillips
Copy link
Copy Markdown

/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 17, 2023
Copy link
Copy Markdown
Member

@mrunalp mrunalp 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 Apr 17, 2023
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 17, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mrunalp, openshift-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign sttts for approval. For more information see the Kubernetes Code Review Process.

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

Details 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

@mrunalp mrunalp added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 17, 2023
@zhouying7780
Copy link
Copy Markdown

/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 18, 2023
@sunilcio
Copy link
Copy Markdown

/label cherry-pick-approved

@mrunalp mrunalp removed the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Apr 18, 2023
@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD 27e744f and 2 for PR HEAD fcc276e in total

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 19, 2023

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

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 37a9a08 into openshift:release-4.12 Apr 19, 2023
@openshift-ci-robot
Copy link
Copy Markdown

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

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

Details

In response to this:

This is an automated cherry-pick of #1475

/assign rphillips


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-robot
Copy link
Copy Markdown

Fix included in accepted release 4.12.0-0.nightly-2023-04-20-032655

@rphillips
Copy link
Copy Markdown

/cherry-pick release-4.11

@openshift-cherrypick-robot
Copy link
Copy Markdown
Author

@rphillips: #1478 failed to apply on top of branch "release-4.11":

Applying: UPSTREAM: <carry>: add default sysctls for kubelet in rpm
Using index info to reconstruct a base tree...
M	openshift.spec
Falling back to patching base and 3-way merge...
Auto-merging openshift.spec
CONFLICT (content): Merge conflict in openshift.spec
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 default sysctls for kubelet in rpm
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".

Details

In response to this:

/cherry-pick release-4.11

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-bot
Copy link
Copy Markdown

[ART PR BUILD NOTIFIER]

This PR has been included in build openshift-enterprise-pod-container-v4.12.0-202305022015.p0.g37a9a08.assembly.stream for distgit openshift-enterprise-pod.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown

[ART PR BUILD NOTIFIER]

This PR has been included in build openshift-enterprise-hyperkube-container-v4.12.0-202305022015.p0.g37a9a08.assembly.stream for distgit openshift-enterprise-hyperkube.
All builds following this will include this PR.

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