Skip to content

Conversation

vparfonov
Copy link
Contributor

Description

/cc @cahartma @Clee2691
/assign @jcantrill

/cherry-pick

Links

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 18, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 18, 2024

@vparfonov: This pull request references LOG-4671 which is a valid jira issue.

In response to this:

Description

/cc @cahartma @Clee2691
/assign @jcantrill

/cherry-pick

Links

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.

@vparfonov
Copy link
Contributor Author

/retest

@vparfonov vparfonov changed the title LOG-4671:respect settings containerLimit.maxRecordsPerSecond to 0 [release-5.8]LOG-4671:respect settings containerLimit.maxRecordsPerSecond to 0 Sep 19, 2024
Copy link
Contributor

@jcantrill jcantrill left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 7, 2024
Copy link
Contributor

openshift-ci bot commented Oct 7, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, vparfonov

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 Oct 7, 2024
@jcantrill
Copy link
Contributor

@vparfonov You will need to clone this issue and port it forward to 6.0 and maybe 5.9 thought 5.9 I believe is going EOL shortly so maybe hold off for the time being

@vparfonov
Copy link
Contributor Author

/cherry-pick release-5.9

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-5.9

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-sigs/prow repository.

@vparfonov
Copy link
Contributor Author

/test e2e-target

Copy link
Contributor

openshift-ci bot commented Oct 7, 2024

@vparfonov: 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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit e785027 into openshift:release-5.8 Oct 7, 2024
10 checks passed
@openshift-cherrypick-robot

@vparfonov: #2802 failed to apply on top of branch "release-5.9":

Applying: LOG-4671:respect settings containerLimit.maxRecordsPerSecond to 0
.git/rebase-apply/patch:134: space before tab in indent.
  	}
.git/rebase-apply/patch:152: space before tab in indent.
  		. = compact(., nullish: true)
.git/rebase-apply/patch:190: space before tab in indent.
  	.level = "trace"
.git/rebase-apply/patch:192: space before tab in indent.
  	priority = to_int!(.PRIORITY)
.git/rebase-apply/patch:193: space before tab in indent.
  	.level, err = to_syslog_level(priority)
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Using index info to reconstruct a base tree...
A	internal/generator/vector/conf_test.go
A	internal/generator/vector/inputs.go
A	internal/generator/vector/pipelines.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): internal/generator/vector/pipelines.go deleted in HEAD and modified in LOG-4671:respect settings containerLimit.maxRecordsPerSecond to 0. Version LOG-4671:respect settings containerLimit.maxRecordsPerSecond to 0 of internal/generator/vector/pipelines.go left in tree.
CONFLICT (modify/delete): internal/generator/vector/inputs.go deleted in HEAD and modified in LOG-4671:respect settings containerLimit.maxRecordsPerSecond to 0. Version LOG-4671:respect settings containerLimit.maxRecordsPerSecond to 0 of internal/generator/vector/inputs.go left in tree.
Auto-merging internal/generator/vector/conf/conf_test.go
CONFLICT (content): Merge conflict in internal/generator/vector/conf/conf_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 LOG-4671:respect settings containerLimit.maxRecordsPerSecond to 0

In response to this:

/cherry-pick release-5.9

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-sigs/prow repository.

@openshift-cherrypick-robot

@vparfonov: cannot checkout <!--: error checking out "<!--": exit status 1 error: pathspec '<!--' did not match any file(s) known to git

In response to this:

Description

/cc @cahartma @Clee2691
/assign @jcantrill

/cherry-pick

Links

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

4 participants