Skip to content

templates: convert kubelet proxy config into a dropin#2194

Closed
vrutkovs wants to merge 1 commit intoopenshift:fcosfrom
vrutkovs:fcos-kubelet-dropin
Closed

templates: convert kubelet proxy config into a dropin#2194
vrutkovs wants to merge 1 commit intoopenshift:fcosfrom
vrutkovs:fcos-kubelet-dropin

Conversation

@vrutkovs
Copy link
Copy Markdown
Contributor

@vrutkovs vrutkovs commented Nov 1, 2020

This ensures OKD 4.5 -> 4.6 upgrade can complete. Currently kubelet config is considered to be a file, but in 4.6 config its a drop in, so MCD can't properly create it.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 1, 2020
@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Nov 1, 2020

/hold

Testing 4.5 latest -> this PR -> 4.6 CI update

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 1, 2020
@vrutkovs vrutkovs force-pushed the fcos-kubelet-dropin branch 7 times, most recently from 74a4ed3 to 693ab3c Compare November 2, 2020 15:12
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Nov 2, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrutkovs

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

@vrutkovs vrutkovs force-pushed the fcos-kubelet-dropin branch from 693ab3c to ff827ea Compare November 2, 2020 16:29
@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Nov 2, 2020

Flakes

/retest

@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Nov 2, 2020

4.5 -> this PR upgrade passes, but 4.5z -> 4.6 still fails. Apparently MCD needs to be fixed

@openshift-merge-robot
Copy link
Copy Markdown
Contributor

openshift-merge-robot commented Nov 2, 2020

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

Test name Commit Details Rerun command
ci/prow/e2e-aws ff827ea link /test e2e-aws

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.

@cgwalters
Copy link
Copy Markdown
Member

cgwalters commented Nov 2, 2020

Ahh this is because 6f5b3c5

@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Nov 2, 2020 •
edited
Loading

Right, that uncovered a bug in MCD stale file handling:

  1. Create systemd dropin via a file
  2. Realize that its suboptimal, convert into a dropin
  3. Ignition will rewrite the file, but MCD's deleteStaleData would remove it file since its no longer in .Storage.Files
  4. Machine would reboot and MCD would complain that file is not found.

I'll file a bug and fix it in MCD master/release-4.6

@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Nov 3, 2020

#2196 to fix this

@vrutkovs vrutkovs closed this Nov 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LorbusChris LorbusChris Awaiting requested review from LorbusChris

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@vrutkovs @openshift-ci-robot @openshift-merge-robot @cgwalters