[release-4.10] OCPBUGS-3500: Add ephemeral storage to kubelet system reserved args

[harche]

This is a manual pick of #3381

[openshift-ci-robot]

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

• expected dependent Jira Issue OCPBUGS-2079 to target a version in 4.11.0, 4.11.z, but it targets "4.12.0" 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 a manual pick of #3381

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]

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

[openshift-ci]

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

[openshift-ci-robot]

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

• expected the bug to target the "4.10.z" version, but it targets "4.11.z" instead
• expected dependent Jira Issue OCPBUGS-2730 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is ON_QA 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 a manual pick of #3381

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]

/jira refresh

[openshift-ci-robot]

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

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

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]

/lgtm

[harche]

/retest

[yuqi-zhang]

Seems like a clean cherrypick

/label backport-risk-assessed

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: harche, rphillips, 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:

• OWNERS [yuqi-zhang]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[harche]

/jira refresh

[openshift-ci-robot]

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

Requesting review from QA contact:
/cc @lyman9966

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.

[harche]

Seems like a clean cherrypick

/label backport-risk-assessed

Thanks @yuqi-zhang

[harche]

/cherry-pick release-4.9

[openshift-cherrypick-robot]

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

Details

In response to this:

/cherry-pick release-4.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/test-infra repository.

[sunilcio]

/label cherry-pick-approved

[harche]

/retest

[openshift-ci-robot]

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

• openshift/machine-config-operator#3381
• openshift/machine-config-operator#3408

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

Details

In response to this:

This is a manual pick of #3381

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-cherrypick-robot]

@harche: #3408 failed to apply on top of branch "release-4.9":

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	templates/master/01-master-kubelet/_base/files/kubelet.yaml
A	templates/master/01-master-kubelet/alibabacloud/units/kubelet.service.yaml
M	templates/worker/01-worker-kubelet/_base/files/kubelet.yaml
A	templates/worker/01-worker-kubelet/alibabacloud/units/kubelet.service.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): templates/worker/01-worker-kubelet/alibabacloud/units/kubelet.service.yaml deleted in HEAD and modified in Add ephemeral storage to kubelet system reserved args. Version Add ephemeral storage to kubelet system reserved args of templates/worker/01-worker-kubelet/alibabacloud/units/kubelet.service.yaml left in tree.
Auto-merging templates/worker/01-worker-kubelet/_base/files/kubelet.yaml
CONFLICT (modify/delete): templates/master/01-master-kubelet/alibabacloud/units/kubelet.service.yaml deleted in HEAD and modified in Add ephemeral storage to kubelet system reserved args. Version Add ephemeral storage to kubelet system reserved args of templates/master/01-master-kubelet/alibabacloud/units/kubelet.service.yaml left in tree.
Auto-merging templates/master/01-master-kubelet/_base/files/kubelet.yaml
Auto-merging pkg/controller/kubelet-config/helpers.go
CONFLICT (content): Merge conflict in 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.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/test-infra repository.

[openshift-ci]

@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-aws-single-node	d09be51	link	false	/test e2e-aws-single-node
ci/prow/okd-e2e-gcp-op	d09be51	link	false	/test okd-e2e-gcp-op
ci/prow/e2e-aws-disruptive	d09be51	link	false	/test e2e-aws-disruptive

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.

[harche]

/cherry-pick release-4.9

[openshift-cherrypick-robot]

@harche: #3408 failed to apply on top of branch "release-4.9":

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	templates/master/01-master-kubelet/_base/files/kubelet.yaml
A	templates/master/01-master-kubelet/alibabacloud/units/kubelet.service.yaml
M	templates/worker/01-worker-kubelet/_base/files/kubelet.yaml
A	templates/worker/01-worker-kubelet/alibabacloud/units/kubelet.service.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): templates/worker/01-worker-kubelet/alibabacloud/units/kubelet.service.yaml deleted in HEAD and modified in Add ephemeral storage to kubelet system reserved args. Version Add ephemeral storage to kubelet system reserved args of templates/worker/01-worker-kubelet/alibabacloud/units/kubelet.service.yaml left in tree.
Auto-merging templates/worker/01-worker-kubelet/_base/files/kubelet.yaml
CONFLICT (modify/delete): templates/master/01-master-kubelet/alibabacloud/units/kubelet.service.yaml deleted in HEAD and modified in Add ephemeral storage to kubelet system reserved args. Version Add ephemeral storage to kubelet system reserved args of templates/master/01-master-kubelet/alibabacloud/units/kubelet.service.yaml left in tree.
Auto-merging templates/master/01-master-kubelet/_base/files/kubelet.yaml
Auto-merging pkg/controller/kubelet-config/helpers.go
CONFLICT (content): Merge conflict in 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.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/test-infra repository.