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

kubelet: use the base filename to check if the filename starts with a dot #45111

Merged

Conversation

dwradcliffe
Copy link
Contributor

What this PR does / why we need it:
Fixes a bug in #39196. The goal was to ignore files that start with a dot but the value used is the full absolute filename including path.

Which issue this PR fixes: fixes #44450

@yujuhong

Release note:

kubelet config should actually ignore files starting with dots

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 28, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot
Copy link
Contributor

Hi @dwradcliffe. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 28, 2017
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Apr 28, 2017
@yujuhong yujuhong assigned yujuhong and unassigned euank and yifan-gu Apr 28, 2017
@yujuhong
Copy link
Contributor

@k8s-bot ok to test

@dwradcliffe thanks for the PR! Could you add a unit test for this?

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 28, 2017
@dwradcliffe
Copy link
Contributor Author

I attempted to write a test for this but for some reason I'm unable to get any of the tests in file_linux_test.go to run at all - they are just skipped. I have a rough idea for how to test this but without being able to run them I can't really write the test.

@yujuhong
Copy link
Contributor

yujuhong commented May 2, 2017

@dwradcliffe did you run the tests on a linux machine? The tests should not be skipped...

@yujuhong yujuhong added this to the v1.7 milestone May 2, 2017
@yujuhong yujuhong added the kind/bug Categorizes issue or PR as related to a bug. label May 2, 2017
@yujuhong
Copy link
Contributor

I am going to merge the PR first since this is a relatively trivial PR. A followup PR to add a unit test for preventing regression would be good.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 16, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 16, 2017
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 16, 2017
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 16, 2017
@dwradcliffe
Copy link
Contributor Author

Rebased as requested

@yujuhong
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 16, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dwradcliffe, yujuhong

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 88a3b5b into kubernetes:master May 16, 2017
@dwradcliffe dwradcliffe deleted the fix_kubelet_config_ignore branch May 16, 2017 19:22
k8s-github-robot pushed a commit that referenced this pull request Sep 25, 2017
…11-upstream-release-1.6

Automatic merge from submit-queue.

Automated cherry pick of #45111

Cherry pick of #45111 on release-1.6.

#45111: use the base filename to check if the filename starts with a
@wojtek-t wojtek-t modified the milestones: v1.7, v1.6 Oct 3, 2017
@wojtek-t
Copy link
Member

wojtek-t commented Oct 3, 2017

This is already in 1.7 branch (it was merged in 1.7 timeframe). Changed milestone to 1.6 where cherrypick was already merged too.

@wojtek-t wojtek-t added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 3, 2017
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.6" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

Kubelet does not restart static manifest pods correctly in 1.6
9 participants