Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix EnvironmentFile path for kubeadm deb package #3279

Merged
merged 1 commit into from
Sep 18, 2023

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented Sep 18, 2023

What type of PR is this?

/kind bug
/kind regression

What this PR does / why we need it:

Debian packages published to the legacy repos have EnvironmentFile in 10-kubeadm.conf set to /etc/default/kubelet. However, Debian packages published to pkgs.k8s.io have this variable set to /etc/sysconfig/kubelet

This is wrong as described in #3276 and https://kubernetes.slack.com/archives/C09NXKJKA/p1694790202990129

Moreover, this is breaking some clusters as described in #3219 (comment)

This PR is supposed to fix this issue by applying some sed magic when building packages ✨ 🧙

Which issue(s) this PR fixes:

Fixes #3276

Special notes for your reviewer:

I'll properly test this change after the PR is merged because I can't run a nomock job on a non-master branch. This fix only applies on packages published after the fix is merged, we don't have a way to alter existing packages.

/priority critical-urgent

Does this PR introduce a user-facing change?

EnvironmentFile is changed from `/etc/sysconfig/kubelet` to `/etc/default/kubelet` for `kubeadm` Debian packages published to `pkgs.k8s.io`

/assign @saschagrunert
cc @kubernetes/release-engineering

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. kind/regression Categorizes issue or PR as related to a regression from a prior release. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/release-eng Issues or PRs related to the Release Engineering subproject sig/release Categorizes an issue or PR as relevant to SIG Release. labels Sep 18, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 18, 2023
Copy link
Member

@cpanato cpanato left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 18, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, xmudrii

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

@k8s-ci-robot k8s-ci-robot merged commit d869537 into kubernetes:master Sep 18, 2023
4 checks passed
@xmudrii xmudrii deleted the 10-kubeadm-conf-deb branch September 18, 2023 15:43
@pacoxu
Copy link
Member

pacoxu commented Sep 19, 2023

/cc @kubernetes/kubeadm-maintainers

@k8s-ci-robot
Copy link
Contributor

@pacoxu: GitHub didn't allow me to request PR reviews from the following users: kubernetes/kubeadm-maintainers.

Note that only kubernetes members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @kubernetes/kubeadm-maintainers

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.

@jorhett
Copy link

jorhett commented May 8, 2024

This is half of the fix, the package places the defaults file in the RedHat location:

$ dpkg -L kubelet |grep /kubelet
/etc/sysconfig/kubelet

So this was halfway fixed, you're referring to an env file that doesn't exist. So the 2nd part of the fix is to adjust the file path in the package.

@xmudrii
Copy link
Member Author

xmudrii commented May 28, 2024

@jorhett This issue should be fixed by #3625

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. area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/regression Categorizes issue or PR as related to a regression from a prior release. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/release Categorizes an issue or PR as relevant to SIG Release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

deb packages for kubelet on pkgs.k8s.io seem to include a systemd service definition for redhat machines
6 participants