Bug 1920027: use separate dropin files for kubelet #2365

darkmuggle · 2021-01-25T22:39:54Z

Test commit to see if rendering/merging dropins may be broken.

yuqi-zhang

Looking at https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_machine-config-operator/2365/pull-ci-openshift-machine-config-operator-master-e2e-aws/1353835083844292608/artifacts/e2e-aws/gather-extra/machineconfigs.json I think this worked! (search for kubelet.service, you can see that both of them are listed as dropins).

Although this doesn't answer the question of why having them in the same file doesn't work, that can be investigated another time. We can try running this against a proxy job just to be safe but I think I am +1 on this.

yuqi-zhang · 2021-01-26T01:13:24Z

/approve

openshift-ci-robot · 2021-01-26T01:29:08Z

@darkmuggle: This pull request references Bugzilla bug 1920027, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1920027: use separate dropin files for kubelet

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.

sinnykumari · 2021-01-26T11:04:49Z

/retest
/test e2e-aws-proxy

darkmuggle · 2021-01-27T22:45:54Z

Looking at https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_machine-config-operator/2365/pull-ci-openshift-machine-config-operator-master-e2e-aws/1353835083844292608/artifacts/e2e-aws/gather-extra/machineconfigs.json I think this worked! (search for kubelet.service, you can see that both of them are listed as dropins).

Although this doesn't answer the question of why having them in the same file doesn't work, that can be investigated another time. We can try running this against a proxy job just to be safe but I think I am +1 on this.

Right @yuqi-zhang, I think that we need to get to the root of the merging problem and why this causing the unpleasant bug. That is something that I'll track down when I can incept more time.

yuqi-zhang

/lgtm

I don't see any risk with this change so we should be good

openshift-ci-robot · 2021-01-28T17:19:18Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

~~OWNERS~~ [darkmuggle,yuqi-zhang]

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

openshift-bot · 2021-01-29T09:40:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T10:06:40Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T10:19:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T11:50:40Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T12:42:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T13:47:38Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T14:52:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T15:18:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T16:23:57Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T16:36:36Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T17:02:35Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T17:41:38Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T19:38:36Z

/retest

Please review the full test history for this PR and help us cut down flakes.

yuqi-zhang · 2021-01-29T19:46:33Z

Hmm, in the recent proxy runs, I still see

Jan 29 14:51:56 ip-10-0-82-57 hyperkube[1433]: E0129 14:51:56.667021    1433 kubelet.go:2169] Container runtime network not ready: NetworkReady=false reason:NetworkPluginNotReady message:Network plugin returns error: No CNI configuration file in /etc/kubernetes/cni/net.d/. Has your network provider started?

Maybe the error is something else?

openshift-bot · 2021-01-29T21:09:38Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-29T22:27:49Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T00:50:53Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T03:39:40Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T03:52:41Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T04:57:41Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T05:36:40Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T05:49:40Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T06:02:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T06:15:46Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T08:12:51Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T08:25:41Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-01-30T09:17:40Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2021-01-30T09:45:48Z

@darkmuggle: The following tests failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-proxy	`11d4534`	link	`/test e2e-aws-proxy`
ci/prow/e2e-aws-workers-rhel7	`11d4534`	link	`/test e2e-aws-workers-rhel7`

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.

openshift-bot · 2021-01-30T10:09:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot · 2021-01-30T10:18:05Z

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

Bugzilla bug 1920027 has been moved to the MODIFIED state.

In response to this:

Bug 1920027: use separate dropin files for kubelet

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.

darkmuggle · 2021-02-25T15:35:09Z

/cherry-pick release-4.6

openshift-cherrypick-robot · 2021-02-25T15:35:13Z

@darkmuggle: cannot checkout 4.6: error checking out 4.6: exit status 1. output: error: pathspec '4.6' did not match any file(s) known to git

In response to this:

/cherry-pick 4.6

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 · 2021-02-25T15:35:44Z

@darkmuggle: #2365 failed to apply on top of branch "release-4.6":

Applying: Bug: 1920027: use seperate dropin files for kubelet
Using index info to reconstruct a base tree...
M	templates/common/_base/units/kubelet.service.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/common/_base/units/kubelet.service.yaml
CONFLICT (content): Merge conflict in templates/common/_base/units/kubelet.service.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug: 1920027: use seperate dropin files for kubelet
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.6

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.

wking · 2021-07-01T04:01:16Z

Backported to 4.6 in #2652.

Bug: 1920027: use seperate dropin files for kubelet

11d4534

openshift-ci-robot requested review from cgwalters and runcom January 25, 2021 22:40

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 25, 2021

yuqi-zhang reviewed Jan 26, 2021

View reviewed changes

kikisdeliveryservice requested review from rphillips and removed request for runcom January 26, 2021 01:27

kikisdeliveryservice changed the title ~~Bug: 1920027: use separate dropin files for kubelet~~ Bug 1920027: use separate dropin files for kubelet Jan 26, 2021

openshift-ci-robot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent 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. labels Jan 26, 2021

yuqi-zhang approved these changes Jan 28, 2021

View reviewed changes

openshift-ci-robot assigned yuqi-zhang Jan 28, 2021

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 28, 2021

openshift-ci-robot mentioned this pull request Jan 29, 2021

Bug 1920027: daemon: handle zero-length dropins/units #2363

Merged

openshift-merge-robot merged commit 3837e38 into openshift:master Jan 30, 2021

openshift-ci-robot mentioned this pull request Feb 2, 2021

Bug 1920027: templates: split crio dropins into separate files #2378

Merged

darkmuggle deleted the pr/different-templates branch February 25, 2021 15:33

Bug 1920027: use separate dropin files for kubelet #2365

Bug 1920027: use separate dropin files for kubelet #2365

Conversation

darkmuggle commented Jan 25, 2021

yuqi-zhang left a comment

Choose a reason for hiding this comment

yuqi-zhang commented Jan 26, 2021

openshift-ci-robot commented Jan 26, 2021

sinnykumari commented Jan 26, 2021

darkmuggle commented Jan 27, 2021

yuqi-zhang left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Jan 28, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

yuqi-zhang commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 29, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-bot commented Jan 30, 2021

openshift-ci bot commented Jan 30, 2021 • edited

openshift-bot commented Jan 30, 2021

openshift-ci-robot commented Jan 30, 2021

darkmuggle commented Feb 25, 2021

openshift-cherrypick-robot commented Feb 25, 2021

openshift-cherrypick-robot commented Feb 25, 2021

wking commented Jul 1, 2021

openshift-ci bot commented Jan 30, 2021 •

edited