Fix cleanup temp dir path #10797

miklezzzz · 2023-12-21T14:30:23Z

What this PR does / why we need it:

As of now, controller doesn't delete temp config files from "/tmp/nginx", clogging up FS, because it seeks them in "/tmp".

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
CVE Report (Scanner found CVE and adding report)
Breaking change (fix or feature that would cause existing functionality to change)
Documentation only

Which issue/s this PR fixes

How Has This Been Tested?

It was tested in a dev cluster. The ingress validation feature was disabled and an intentionally wrong snippet was introduced to make ingress controller check configuration for a substantial period of time. It transpired that temp configuration files don't get deleted at all.

Checklist:

My change requires a change to the documentation.
I have updated the documentation accordingly.
I've read the CONTRIBUTION guide
I have added unit and/or e2e tests to cover my changes.
All new and existing tests passed.

linux-foundation-easycla · 2023-12-21T14:30:27Z

The committers listed above are authorized under a signed CLA.

✅ login: miklezzzz / name: Mikhail Scherba (cbaf6fb, 257e919, bc67504, 771faa1)

netlify · 2023-12-21T14:30:29Z

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

Name	Link
🔨 Latest commit	`257e919`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/65f1573dd97b3000081ee599

k8s-ci-robot · 2023-12-21T14:30:31Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: miklezzzz
Once this PR has been reviewed and has the lgtm label, please assign rikatz for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

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 · 2023-12-21T14:30:31Z

This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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.

k8s-ci-robot · 2023-12-21T14:30:31Z

Welcome @miklezzzz!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2023-12-21T14:30:32Z

Hi @miklezzzz. 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 /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.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

miklezzzz · 2023-12-21T15:32:29Z

it seems it makes sense to have it as + "/nginx/" (with a trailing slash), without slash path.Walk doesn't walk over symlinks which is a problem for a chroot'ed image

rikatz · 2023-12-26T23:48:35Z

/ok-to-test

cpanato

some questions

cpanato · 2024-01-20T09:51:42Z

internal/ingress/controller/nginx.go

@@ -71,6 +71,8 @@ const (
 	emptyUID         = "-1"
 )

+var tmpDir = os.TempDir() + "/nginx/"


this really need to be a global thing?

well, the same value should be used across several functions in nginx.go like NewNGINXController and cleanTmpNginxCfg so I thought it would make sense to define that variable globally. Moreover, I trust I saw some other local tmpDir's in other packages which is pitty and perhaps requires refactoring.

cpanato · 2024-01-20T09:53:16Z

internal/ingress/controller/nginx_test.go

@@ -361,28 +361,28 @@ func TestCleanTempNginxCfg(t *testing.T) {
 		t.Fatal(err)
 	}

-	tmpfile, err := os.CreateTemp("", tempNginxPattern)
+	tmpfile1, err := os.CreateTemp(tmpDir, tempNginxPattern)


here you dont need to set that

If dir is the empty string, CreateTemp uses the default directory for temporary files, as returned by TempDir.

if we leave it unset, it uses /tmp but the point is that some time ago a change was introduced to NewNGINXController func that defined tmpDir for temp files (configs) as os.TempDir() + "/nginx", from that point cleanTempNginxCfg func had stopped to work.
Now, we are here :)

i see, thanks for the clarification

Signed-off-by: Mikhail Scherba <[email protected]>

k8s-ci-robot · 2024-10-23T02:21:37Z

PR needs rebase.

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-sigs/prow repository.

Gacko · 2025-01-10T21:57:32Z

Already done in #11569.

k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Dec 21, 2023

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 Dec 21, 2023

k8s-ci-robot added the needs-kind Indicates a PR lacks a `kind/foo` label and requires one. label Dec 21, 2023

k8s-ci-robot requested review from cpanato and strongjz December 21, 2023 14:30

k8s-ci-robot added needs-priority size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 21, 2023

miklezzzz mentioned this pull request Dec 21, 2023

[ingress-nginx] fix cleanup temp dir path deckhouse/deckhouse#6985

Merged

4 tasks

miklezzzz force-pushed the fix-cleanup-tempdir-path branch from 5c70a9d to d3afb03 Compare December 22, 2023 08:11

miklezzzz force-pushed the fix-cleanup-tempdir-path branch from cbc29b6 to 050c887 Compare December 23, 2023 08:26

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 26, 2023

cpanato requested changes Jan 20, 2024

View reviewed changes

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 8, 2024

miklezzzz added 3 commits March 13, 2024 10:23

fix cleanup temp dir path

cbaf6fb

Signed-off-by: Mikhail Scherba <[email protected]>

add a trailing slash to tmpDir

bc67504

Signed-off-by: Mikhail Scherba <[email protected]>

fix TestCleanTempNginxCfg

771faa1

Signed-off-by: Mikhail Scherba <[email protected]>

miklezzzz force-pushed the fix-cleanup-tempdir-path branch from 050c887 to 771faa1 Compare March 13, 2024 07:25

fix go-lint

257e919

Signed-off-by: Mikhail Scherba <[email protected]>

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 13, 2024

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 23, 2024

Gacko closed this Jan 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix cleanup temp dir path #10797

Fix cleanup temp dir path #10797

miklezzzz commented Dec 21, 2023 •

edited

Loading

linux-foundation-easycla bot commented Dec 21, 2023 •

edited

Loading

netlify bot commented Dec 21, 2023 •

edited

Loading

k8s-ci-robot commented Dec 21, 2023

k8s-ci-robot commented Dec 21, 2023

k8s-ci-robot commented Dec 21, 2023

k8s-ci-robot commented Dec 21, 2023

miklezzzz commented Dec 21, 2023

rikatz commented Dec 26, 2023

cpanato left a comment

cpanato Jan 20, 2024

miklezzzz Jan 21, 2024

cpanato Jan 20, 2024

miklezzzz Jan 21, 2024

cpanato Jan 23, 2024

k8s-ci-robot commented Oct 23, 2024

Gacko commented Jan 10, 2025

Fix cleanup temp dir path #10797

Fix cleanup temp dir path #10797

Conversation

miklezzzz commented Dec 21, 2023 • edited Loading

What this PR does / why we need it:

Types of changes

Which issue/s this PR fixes

How Has This Been Tested?

Checklist:

linux-foundation-easycla bot commented Dec 21, 2023 • edited Loading

netlify bot commented Dec 21, 2023 • edited Loading

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

k8s-ci-robot commented Dec 21, 2023

k8s-ci-robot commented Dec 21, 2023

k8s-ci-robot commented Dec 21, 2023

k8s-ci-robot commented Dec 21, 2023

miklezzzz commented Dec 21, 2023

rikatz commented Dec 26, 2023

cpanato left a comment

Choose a reason for hiding this comment

cpanato Jan 20, 2024

Choose a reason for hiding this comment

miklezzzz Jan 21, 2024

Choose a reason for hiding this comment

cpanato Jan 20, 2024

Choose a reason for hiding this comment

miklezzzz Jan 21, 2024

Choose a reason for hiding this comment

cpanato Jan 23, 2024

Choose a reason for hiding this comment

k8s-ci-robot commented Oct 23, 2024

Gacko commented Jan 10, 2025

miklezzzz commented Dec 21, 2023 •

edited

Loading

linux-foundation-easycla bot commented Dec 21, 2023 •

edited

Loading

netlify bot commented Dec 21, 2023 •

edited

Loading