Skip to content

Conversation

@harche
Copy link
Contributor

@harche harche commented Nov 23, 2022

This is a manual pick of #3408

Signed-off-by: Harshal Patil <harpatil@redhat.com>
@openshift-ci-robot
Copy link
Contributor

@harche: This pull request references Jira Issue OCPBUGS-4051, which is invalid:

  • expected Jira Issue OCPBUGS-4051 to depend on a bug targeting a version in 4.10.0, 4.10.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

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 a manual pick of #3408

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-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 23, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 23, 2022

@harche: 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.10] OCPBUGS-4051: Add ephemeral storage to kubelet system reserved args

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.

@harche harche changed the title [release-4.10] OCPBUGS-4051: Add ephemeral storage to kubelet system reserved args [release-4.9] OCPBUGS-4051: Add ephemeral storage to kubelet system reserved args Nov 23, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 23, 2022

@harche: 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.9] OCPBUGS-4051: Add ephemeral storage to kubelet system reserved args

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.

@harche
Copy link
Contributor Author

harche commented Nov 23, 2022

/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 Nov 23, 2022
@openshift-ci openshift-ci bot requested a review from rphillips November 23, 2022 16:30
@openshift-ci-robot
Copy link
Contributor

@harche: This pull request references Jira Issue OCPBUGS-4051, 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.9.z) matches configured target version for branch (4.9.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-3500 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-3500 targets the "4.10.z" version, which is one of the valid target versions: 4.10.0, 4.10.z
  • bug has dependents

Requesting review from QA contact:
/cc @lyman9966

The bug has been updated to refer to the pull request using the external bug tracker.

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.

@openshift-ci openshift-ci bot requested review from lyman9966 and sjenning November 23, 2022 16:30
@harche
Copy link
Contributor Author

harche commented Nov 23, 2022

/retest

@harche
Copy link
Contributor Author

harche commented Nov 24, 2022

/cc @yuqi-zhang

@openshift-ci openshift-ci bot requested a review from yuqi-zhang November 24, 2022 02:00
@harche
Copy link
Contributor Author

harche commented Nov 24, 2022

/retest-required

Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

Seems fine from a sanity perspective. How far do you anticipate needing to backport this, and do we need to do any additional testing?

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 24, 2022
@harche
Copy link
Contributor Author

harche commented Nov 25, 2022

Seems fine from a sanity perspective. How far do you anticipate needing to backport this, and do we need to do any additional testing?

Thanks @yuqi-zhang for the approval. We introduced the auto node sizing in 4.8, so these backports will have to go all the way till 4.8.

Apart from the testing QA is doing to verify the PRs, we don't need anything more than that.

@yuqi-zhang
Copy link
Contributor

/label cherry-pick-approved
/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 28, 2022

@yuqi-zhang: Can not set label cherry-pick-approved: Must be member in one of these teams: []

Details

In response to this:

/label cherry-pick-approved
/lgtm

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 added the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2022
@yuqi-zhang
Copy link
Contributor

sorry wrong label

/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 Nov 28, 2022
@mburman5 mburman5 removed their assignment Dec 7, 2022
@wking
Copy link
Member

wking commented Dec 7, 2022

We should resolve OCPBUGS-4101 before backporting this further.

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 7, 2022
@harche
Copy link
Contributor Author

harche commented Jan 4, 2023

@wking https://issues.redhat.com/browse/OCPBUGS-4101 is now in verified state. Should we remove the hold from this PR?

@yuqi-zhang
Copy link
Contributor

looking at the other chain, it is awaiting backport to 4.11: #3459

how are these interweaved again? Do we need to wait for that to get into previous versions? Or is that not directly related

@harche
Copy link
Contributor Author

harche commented Jan 11, 2023

@yuqi-zhang When we set the system reserved values for the kubelet, we should have been setting memory, cpu and ephemeral storage values. But for some reason we were only setting memory and cpu. This PR fixes that issue and sets the missing ephemeral storage value for the kubelet.

On the other hand, #3459 makese the system reserved values more reselient against a blank (and hence invalid) input.

These two PRs are linked. (This) one introduces missing parameter and other one makes those parameters more resilient against bad input.

@yuqi-zhang
Copy link
Contributor

Ok, so not directly conflicting in any way, I think both are now awaiting QE approval, but can otherwise be merged as needed

@sunilcio
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 Jan 13, 2023
@yuqi-zhang
Copy link
Contributor

Based on the conversation in slack, we will wait for #3487 to merge, then backport both via this PR together, does that sound correct?

@harche
Copy link
Contributor Author

harche commented Jan 16, 2023

Based on the conversation in slack, we will wait for #3487 to merge, then backport both via this PR together, does that sound correct?

Yes, that's correct.

Signed-off-by: Harshal Patil <harpatil@redhat.com>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 26, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 26, 2023

@harche: 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-ovn-step-registry 7397027 link false /test e2e-ovn-step-registry
ci/prow/okd-e2e-upgrade 7397027 link false /test okd-e2e-upgrade
ci/prow/e2e-aws-upgrade-single-node 7397027 link false /test e2e-aws-upgrade-single-node
ci/prow/e2e-aws-workers-rhel8 7397027 link false /test e2e-aws-workers-rhel8
ci/prow/4.9-upgrade-from-stable-4.8-e2e-aws-ovn-upgrade 7397027 link false /test 4.9-upgrade-from-stable-4.8-e2e-aws-ovn-upgrade
ci/prow/e2e-aws-disruptive 7397027 link false /test e2e-aws-disruptive
ci/prow/okd-e2e-aws 7397027 link false /test okd-e2e-aws
ci/prow/okd-e2e-gcp-op 7397027 link false /test okd-e2e-gcp-op

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.

@yuqi-zhang
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 26, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 26, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: harche, yuqi-zhang

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

The pull request process is described 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

@lyman9966
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jan 30, 2023
@yuqi-zhang
Copy link
Contributor

We have all the necessary labels, ad the other dependent bug https://issues.redhat.com//browse/OCPBUGS-5831 has been verified for 4.10

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 3, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD b2055c0 and 2 for PR HEAD 7397027 in total

@openshift-merge-robot openshift-merge-robot merged commit 30fd1e3 into openshift:release-4.9 Feb 3, 2023
@openshift-ci-robot
Copy link
Contributor

@harche: All pull requests linked via external trackers have merged:

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

Details

In response to this:

This is a manual pick of #3408

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.

@harche
Copy link
Contributor Author

harche commented Feb 7, 2023

/cherry-pick release-4.8

@openshift-cherrypick-robot

@harche: #3429 failed to apply on top of branch "release-4.8":

Applying: Add ephemeral storage to kubelet system reserved args
Using index info to reconstruct a base tree...
M	pkg/controller/kubelet-config/helpers.go
M	pkg/controller/kubelet-config/kubelet_config_controller.go
M	templates/master/01-master-kubelet/_base/units/kubelet.service.yaml
M	templates/master/01-master-kubelet/on-prem/units/kubelet.service.yaml
M	templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml
M	templates/worker/01-worker-kubelet/on-prem/units/kubelet.service.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/worker/01-worker-kubelet/on-prem/units/kubelet.service.yaml
Auto-merging templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml
Auto-merging templates/master/01-master-kubelet/on-prem/units/kubelet.service.yaml
Auto-merging templates/master/01-master-kubelet/_base/units/kubelet.service.yaml
Auto-merging pkg/controller/kubelet-config/kubelet_config_controller.go
CONFLICT (content): Merge conflict in pkg/controller/kubelet-config/kubelet_config_controller.go
Auto-merging pkg/controller/kubelet-config/helpers.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 Add ephemeral storage to kubelet system reserved args
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.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.

@yuqi-zhang
Copy link
Contributor

Is there anyone asking for this to go to 4.8? I think 4.8 is old enough such that this shouldn't really be necessary

@harche
Copy link
Contributor Author

harche commented Feb 7, 2023

Is there anyone asking for this to go to 4.8? I think 4.8 is old enough such that this shouldn't really be necessary

Yeah, you are right. I won't pursue this unless someone asks for it.

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. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.