Skip to content

Backport to 1.14: Only set PutObject Tagging when tags are configured - #309

Merged
sseago merged 2 commits into
velero-io:release-1.14from
cleverer:fix/backport-tag-fix
Jun 26, 2026
Merged

sseago merged 2 commits into
velero-io:release-1.14from
cleverer:fix/backport-tag-fix

Conversation

@cleverer

@cleverer cleverer commented Jun 26, 2026 •

Copy link
Copy Markdown

Backports #299 to Release 1.14

@cleverer cleverer changed the title Only set PutObject Tagging when tags are configured Backport to 1.14: Only set PutObject Tagging when tags are configured Jun 26, 2026
dillonbrowne and others added 2 commits June 26, 2026 10:08
PutObject always passed Tagging: aws.String(o.tagging), even when the
BSL config's `tagging` field is the default empty string. With newer
aws-sdk-go-v2 (pulled in via the Go 1.25 bump for v1.14.x), an empty
*string still serializes an empty `x-amz-tagging:` HTTP header,
which S3-compatible backends reject — Backblaze B2 returns HTTP 400
"InvalidArgument: Unsupported header 'x-amz-tagging'" on the final
velero-backup.json write, leaving PVB data orphaned in the bucket
without an index file.

Older aws-sdk-go-v2 (in v1.13.1) omitted the header when the value
was empty, masking the bug.

Extract the PutObjectInput construction into a buildPutObjectInput
helper, and guard the Tagging assignment with `if o.tagging != ""`
so empty configs send no Tagging field at all. This matches the
existing pattern for `checksumAlgorithm` / `kmsKeyID` /
`customerKeyEncryptionFile` already used in the same function.

Add a table-driven TestBuildPutObjectInput regression test covering:
- empty config produces no Tagging / no SSE / no checksum
- non-empty tagging is set verbatim
- checksumAlgorithm sets ChecksumAlgorithm
- kmsKeyID switches SSE to aws:kms with the key ID
- sseCustomerKey populates SSE-C fields
- serverSideEncryption sets ServerSideEncryption

Fixes silent breakage of Velero backups on Backblaze B2 (and likely
other S3-compatible backends that don't tolerate the empty header)
when using velero-plugin-for-aws v1.14.x.

Signed-off-by: Dillon Browne <[email protected]>
(cherry picked from commit 8dbd6b8)
Signed-off-by: Tiger Kaovilai <[email protected]>
@sseago
sseago merged commit 290b202 into velero-io:release-1.14 Jun 26, 2026
3 checks passed
@cleverer
cleverer deleted the fix/backport-tag-fix branch June 26, 2026 15:58
@cleverer

Copy link
Copy Markdown
Author

@kaovilai @sseago could this be released by any chance? Or anything blocking from creating a new v14 release? Its really annoying for me that with automatic update management I always have to manually roll back the aws plugin version to v13…

scareyo pushed a commit to scareyo/homelab that referenced this pull request Oct 24, 2026
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [velero/velero-plugin-for-aws](https://github.com/vmware-tanzu/velero-plugin-for-aws) | image | minor | `v1.12.0` → `v1.14.4` |

---

### Release Notes

<details>
<summary>vmware-tanzu/velero-plugin-for-aws (velero/velero-plugin-for-aws)</summary>

### [`v1.14.4`](https://github.com/velero-io/velero-plugin-for-aws/releases/tag/v1.14.4)

[Compare Source](velero-io/velero-plugin-for-aws@v1.14.3...v1.14.4)

#### All changes

- Fix CVEs for 1.14.4. ([#&#8203;336](velero-io/velero-plugin-for-aws#336), [@&#8203;blackpiglet](https://github.com/blackpiglet))

### [`v1.14.3`](https://github.com/velero-io/velero-plugin-for-aws/releases/tag/v1.14.3)

[Compare Source](velero-io/velero-plugin-for-aws@v1.14.2...v1.14.3)

#### All changes

- Bump golang version and google.golang.org/grpc version. ([#&#8203;333](velero-io/velero-plugin-for-aws#333), [@&#8203;blackpiglet](https://github.com/blackpiglet))
- Bump dependencies and Go version to fix CVEs ([#&#8203;329](velero-io/velero-plugin-for-aws#329), [@&#8203;blackpiglet](https://github.com/blackpiglet))
- Fix prevent amz-checksum encapsulation when checksumAlgorithm="" ([#&#8203;313](velero-io/velero-plugin-for-aws#313), [@&#8203;kaovilai](https://github.com/kaovilai))
- Fix SSE-C signed URLs ([#&#8203;310](velero-io/velero-plugin-for-aws#310), [@&#8203;Minding000](https://github.com/Minding000))
- Only set PutObject Tagging when tags are configured ([#&#8203;309](velero-io/velero-plugin-for-aws#309), [@&#8203;cleverer](https://github.com/cleverer))

### [`v1.14.2`](https://github.com/velero-io/velero-plugin-for-aws/releases/tag/v1.14.2)

[Compare Source](velero-io/velero-plugin-for-aws@v1.14.1...v1.14.2)

#### All changes

- Backport PR [#&#8203;276](velero-io/velero-plugin-for-aws#276) support for specifying KMS key for EBS volume restoration ([#&#8203;306](velero-io/velero-plugin-for-aws#306), [@&#8203;TheKingMarco](https://github.com/TheKingMarco))
- Bump dependencies to fix CVEs for v1.14.2 ([#&#8203;305](velero-io/velero-plugin-for-aws#305), [@&#8203;blackpiglet](https://github.com/blackpiglet))
- \[1.14] Bump dependancies version ([#&#8203;302](velero-io/velero-plugin-for-aws#302), [@&#8203;blackpiglet](https://github.com/blackpiglet))

### [`v1.14.1`](https://github.com/velero-io/velero-plugin-for-aws/releases/tag/v1.14.1)

[Compare Source](velero-io/velero-plugin-for-aws@v1.14.0...v1.14.1)

#### All changes

- Bump Velero to v1.18.1-rc.1 ([#&#8203;292](velero-io/velero-plugin-for-aws#292), [@&#8203;blackpiglet](https://github.com/blackpiglet))
- Bump Golang to 1.25.9 and go.mod to fix CVEs. ([#&#8203;291](velero-io/velero-plugin-for-aws#291), [@&#8203;blackpiglet](https://github.com/blackpiglet))

### [`v1.14.0`](https://github.com/velero-io/velero-plugin-for-aws/releases/tag/v1.14.0)

[Compare Source](velero-io/velero-plugin-for-aws@v1.13.2...v1.14.0)

#### All changes

- Bump Golang to 1.25.7 for v1.14.0-rc.1 ([#&#8203;282](velero-io/velero-plugin-for-aws#282), [@&#8203;blackpiglet](https://github.com/blackpiglet))
- Bump golang from 1.24 to 1.25 ([#&#8203;281](velero-io/velero-plugin-for-aws#281), [@&#8203;blackpiglet](https://github.com/blackpiglet))

### [`v1.13.2`](https://github.com/velero-io/velero-plugin-for-aws/releases/tag/v1.13.2)

[Compare Source](velero-io/velero-plugin-for-aws@v1.13.1...v1.13.2)

#### All changes

- Bump Golang to 1.24.11 ([#&#8203;277](velero-io/velero-plugin-for-aws#277), [@&#8203;blackpiglet](https://github.com/blackpiglet))

### [`v1.13.1`](https://github.com/velero-io/velero-plugin-for-aws/releases/tag/v1.13.1)

[Compare Source](velero-io/velero-plugin-for-aws@v1.13.0...v1.13.1)

#### All changes

- Bump Golang to 1.24.9 for v1.13.1 ([#&#8203;275](velero-io/velero-plugin-for-aws#275), [@&#8203;blackpiglet](https://github.com/blackpiglet))

### [`v1.13.0`](https://github.com/velero-io/velero-plugin-for-aws/releases/tag/v1.13.0)

[Compare Source](velero-io/velero-plugin-for-aws@v1.12.2...v1.13.0)

#### All changes

- Remove GCR Update some action versions ([#&#8203;260](velero-io/velero-plugin-for-aws#260), [@&#8203;blackpiglet](https://github.com/blackpiglet))
- Add secret support for SSE-C with customer-provided keys in Velero AWS plugin ([@&#8203;261](https://github.com/261), [@&#8203;kaovilai](https://github.com/kaovilai))
- AWS plugin README lacks entries for velero 1.16 and AWS plugin 1.12 ([@&#8203;262](https://github.com/262), [@&#8203;hu-keyu](https://github.com/hu-keyu))

### [`v1.12.2`](https://github.com/velero-io/velero-plugin-for-aws/releases/tag/v1.12.2)

[Compare Source](velero-io/velero-plugin-for-aws@v1.12.1...v1.12.2)

#### What's Changed

- Bump golang to 1.23.10 to fix CVEs. ([#&#8203;264](velero-io/velero-plugin-for-aws#264), [@&#8203;theadarshsaxena](https://github.com/theadarshsaxena))
- Bump Golang version to v1.23.11 to align with Velero v1.16.2. ([#&#8203;266](velero-io/velero-plugin-for-aws#266), [@&#8203;blackpiglet](https://github.com/blackpiglet))

### [`v1.12.1`](https://github.com/velero-io/velero-plugin-for-aws/releases/tag/v1.12.1)

[Compare Source](velero-io/velero-plugin-for-aws@v1.12.0...v1.12.1)

#### What's Changed

- Remove GCR. Update some action versions. ([#&#8203;259](velero-io/velero-plugin-for-aws#259), [@&#8203;blackpiglet](https://github.com/blackpiglet))
- Bump Golang and golang.org/x/net to fix CVEs. ([#&#8203;257](velero-io/velero-plugin-for-aws#257), [@&#8203;blackpiglet](https://github.com/blackpiglet))

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - At any time (no schedule defined)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate CLI](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4xMDQuMCIsInVwZGF0ZWRJblZlciI6IjQ0LjEwNC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Reviewed-on: https://scarey.dev/scarey/homelab/pulls/41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

velero-plugin-for-aws (v1.14.1) fails with Cloudflare R2

5 participants