Don't write whiteout files to directories that were replaced with files or links #2590
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gabyx
approved these changes
Jun 20, 2023
| if err != nil { | ||
| return err | ||
| } | ||
| if skipWhiteout { |
|
|
||
| for _, file := range kanikoFiles { | ||
| if strings.HasPrefix(file, "a/.wh.") { | ||
| t.Errorf("Last layer should not add whiteout files to deleted directory but found %s", file) |
|
Agree w/ @gabyx, LGTM just address the single nit - |
andreasf
force-pushed
the
fix_2308_files_or_links
branch
from
2e765ba
to
94fe941
Compare
integration/integration_test.go
Outdated
| @@ -896,10 +955,10 @@ func initIntegrationTestConfig() *integrationTestConfig { | |||
| var gcsEndpoint string | |||
| var disableGcsAuth bool | |||
| flag.StringVar(&c.gcsBucket, "bucket", "gs://kaniko-test-bucket", "The gcs bucket argument to uploaded the tar-ed contents of the `integration` dir to.") | |||
| flag.StringVar(&c.imageRepo, "repo", "gcr.io/kaniko-test", "The (docker) image repo to build and push images to during the test. `gcloud` must be authenticated with this repo or serviceAccount must be set.") | |||
| flag.StringVar(&c.imageRepo, "repo", "localhost:5000", "The (docker) image repo to build and push images to during the test. `gcloud` must be authenticated with this repo or serviceAccount must be set.") | |||
There was a problem hiding this comment.
I missed this initially but can you also change this back to its original value
integration/integration_test.go
Outdated
| flag.StringVar(&c.serviceAccount, "serviceAccount", "", "The path to the service account push images to GCR and upload/download files to GCS.") | ||
| flag.StringVar(&gcsEndpoint, "gcs-endpoint", "", "Custom endpoint for GCS. Used for local integration tests") | ||
| flag.BoolVar(&disableGcsAuth, "disable-gcs-auth", false, "Disable GCS Authentication. Used for local integration tests") | ||
| flag.BoolVar(&disableGcsAuth, "disable-gcs-auth", true, "Disable GCS Authentication. Used for local integration tests") |
There was a problem hiding this comment.
I missed this initially but can you also change this back to its original value
…es or links If a non-empty directory gets replaced with something other than a directory (e.g. file or symlink), the files in that directory also get deleted. However, there should not be any whiteout files for them in the layer. If there were, the resulting tar file would not be extractable. Fixes GoogleContainerTools#2308
andreasf
force-pushed
the
fix_2308_files_or_links
branch
from
94fe941
to
e710ac2
Compare
aaron-prindle
approved these changes
Jun 22, 2023
kylecarbs
pushed a commit
to coder/kaniko
that referenced
this pull request
Jul 12, 2023
…es or links (GoogleContainerTools#2590) If a non-empty directory gets replaced with something other than a directory (e.g. file or symlink), the files in that directory also get deleted. However, there should not be any whiteout files for them in the layer. If there were, the resulting tar file would not be extractable. Fixes GoogleContainerTools#2308
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2308
Description
If a non-empty directory gets replaced with something other than a directory (e.g. file or symlink), the files in that directory also get deleted. However, there should not be any whiteout files for them in the layer. If there were, the resulting tar file would not be extractable.
Submitter Checklist
These are the criteria that every PR should meet, please check them off as you
review them:
See the contribution guide for more details.
Reviewer Notes