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

Do no use tenant key on S3 KMS SSE when uploading deletion marker #5575

Merged
merged 1 commit into from
Sep 22, 2023

Conversation

alanprot
Copy link
Member

What this PR does:

This marker is used by cortex to clean up the tenant files after deletion and so should still be accessible by cortex after the deletion.

This file also only store the time of the deletion (non sensitive), and so, i don't see any reason why we need this to be encrypted tenant key.

type TenantDeletionMark struct {
	// Unix timestamp when deletion marker was created.
	DeletionTime int64 `json:"deletion_time"`

	// Unix timestamp when cleanup was finished.
	FinishedTime int64 `json:"finished_time,omitempty"`
}

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • [NA] Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@alanprot alanprot force-pushed the non-cmk-deletion branch 2 times, most recently from 9816291 to a83811c Compare September 22, 2023 19:50
@pull-request-size pull-request-size bot added size/M and removed size/S labels Sep 22, 2023
@alanprot alanprot merged commit 189e6c5 into cortexproject:master Sep 22, 2023
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants