Skip to content

CNTRLPLANE-2678: Adapt etcd-backup command and add HO namespace manifests - #8040

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
jparrill:CNTRLPLANE-2678-etc-backup
Mar 27, 2026
Merged

CNTRLPLANE-2678: Adapt etcd-backup command and add HO namespace manifests#8040
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
jparrill:CNTRLPLANE-2678-etc-backup

Conversation

@jparrill

@jparrill jparrill commented Mar 23, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Adapts the etcd-backup CPO subcommand to work when the backup Job runs from the HO namespace, aligning cert paths with the fetch-etcd-certs subcommand from PR CNTRLPLANE-2678: Add fetch-etcd-certs CPO subcommand for HCPEtcdBackup #8010.
  • Removes S3 upload logic from etcd-backup (upload responsibility moves to a separate etcd-upload step).
  • Adds new manifest functions for HO namespace deployment: EtcdBackupJob, EtcdBackupJobServiceAccount, EtcdBackupJobRole, EtcdBackupJobRoleBinding, EtcdBackupNetworkPolicy.
  • Preserves backward compatibility with existing EtcdBackupCronJob and EtcdBackupServiceAccount.
  • Adds integration tests validating both the new HO namespace flow (cross-namespace RBAC + NetworkPolicy + fetch-etcd-certs) and the legacy HCP namespace flow (direct volume mounts).

Dependencies

Related PRs

Test plan

  • Unit tests for etcd-backup command flags and defaults
  • Unit tests for all new manifest functions
  • Integration tests validated against a live management cluster
    • HO namespace flow: Job with fetch-etcd-certs + etcdctl snapshot + etcdutl verify
    • HCP namespace flow (legacy): Job with direct volume mounts + etcdctl snapshot + etcdutl verify
  • make verify passes

How to run integration tests

KUBECONFIG=/path/to/management-cluster/kubeconfig \
ETCD_BACKUP_TEST_HCP_NAMESPACE=clusters-my-hcp \
  go test -tags integration -v -timeout 10m ./test/integration/oadp/backup/...

Ref: CNTRLPLANE-2678

🤖 Generated with Claude Code

@openshift-ci-robot

Copy link
Copy Markdown

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 23, 2026
@openshift-ci-robot

openshift-ci-robot commented Mar 23, 2026

Copy link
Copy Markdown

@jparrill: This pull request references CNTRLPLANE-2678 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Summary

  • Adapts the etcd-backup CPO subcommand to work when the backup Job runs from the HO namespace, aligning cert paths with the fetch-etcd-certs subcommand from PR CNTRLPLANE-2678: Add fetch-etcd-certs CPO subcommand for HCPEtcdBackup #8010.
  • Removes S3 upload logic from etcd-backup (upload responsibility moves to a separate etcd-upload step).
  • Adds new manifest functions for HO namespace deployment: EtcdBackupJob, EtcdBackupJobServiceAccount, EtcdBackupJobRole, EtcdBackupJobRoleBinding, EtcdBackupNetworkPolicy.
  • Preserves backward compatibility with existing EtcdBackupCronJob and EtcdBackupServiceAccount.
  • Adds integration tests validating both the new HO namespace flow (cross-namespace RBAC + NetworkPolicy + fetch-etcd-certs) and the legacy HCP namespace flow (direct volume mounts).

Dependencies

Test plan

  • Unit tests for etcd-backup command flags and defaults
  • Unit tests for all new manifest functions
  • Integration tests validated against a live management cluster
  • HO namespace flow: Job with fetch-etcd-certs + etcdctl snapshot + etcdutl verify
  • HCP namespace flow (legacy): Job with direct volume mounts + etcdctl snapshot + etcdutl verify
  • make verify passes

How to run integration tests

KUBECONFIG=/path/to/management-cluster/kubeconfig \
ETCD_BACKUP_TEST_HCP_NAMESPACE=clusters-my-hcp \
 go test -tags integration -v -timeout 10m ./test/integration/oadp/backup/...

Ref: CNTRLPLANE-2678

🤖 Generated with Claude Code

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 23, 2026
@openshift-ci

openshift-ci Bot commented Mar 23, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai

coderabbitai Bot commented Mar 23, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)
  • do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: abf5bfc3-5da6-4210-a899-092c85452843

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci-robot

openshift-ci-robot commented Mar 23, 2026

Copy link
Copy Markdown

@jparrill: This pull request references CNTRLPLANE-2678 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Summary

  • Adapts the etcd-backup CPO subcommand to work when the backup Job runs from the HO namespace, aligning cert paths with the fetch-etcd-certs subcommand from PR CNTRLPLANE-2678: Add fetch-etcd-certs CPO subcommand for HCPEtcdBackup #8010.
  • Removes S3 upload logic from etcd-backup (upload responsibility moves to a separate etcd-upload step).
  • Adds new manifest functions for HO namespace deployment: EtcdBackupJob, EtcdBackupJobServiceAccount, EtcdBackupJobRole, EtcdBackupJobRoleBinding, EtcdBackupNetworkPolicy.
  • Preserves backward compatibility with existing EtcdBackupCronJob and EtcdBackupServiceAccount.
  • Adds integration tests validating both the new HO namespace flow (cross-namespace RBAC + NetworkPolicy + fetch-etcd-certs) and the legacy HCP namespace flow (direct volume mounts).

Dependencies

Test plan

  • Unit tests for etcd-backup command flags and defaults
  • Unit tests for all new manifest functions
  • Integration tests validated against a live management cluster
  • HO namespace flow: Job with fetch-etcd-certs + etcdctl snapshot + etcdutl verify
  • HCP namespace flow (legacy): Job with direct volume mounts + etcdctl snapshot + etcdutl verify
  • make verify passes

How to run integration tests

KUBECONFIG=/path/to/management-cluster/kubeconfig \
ETCD_BACKUP_TEST_HCP_NAMESPACE=clusters-my-hcp \
 go test -tags integration -v -timeout 10m ./test/integration/oadp/backup/...

Ref: CNTRLPLANE-2678

🤖 Generated with Claude Code

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added do-not-merge/needs-area area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release approved Indicates a PR has been approved by an approver from all required OWNERS files. area/testing Indicates the PR includes changes for e2e testing and removed do-not-merge/needs-area labels Mar 23, 2026
@jparrill

Copy link
Copy Markdown
Contributor Author

/hold

This PR depends on #8010 (fetch-etcd-certs subcommand). Do not merge until that PR is merged.

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 23, 2026
@jparrill
jparrill force-pushed the CNTRLPLANE-2678-etc-backup branch from 9e1d594 to f27d0d8 Compare March 23, 2026 18:54

@sdminonne sdminonne left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only minor stuff. Please @jparrill comment and eventually follow-up then it's good to me.

Comment thread test/integration/oadp/backup/etcd_backup_test.go Outdated
Comment thread test/integration/oadp/backup/etcd_backup_test.go Outdated
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

@openshift-ci

openshift-ci Bot commented Mar 24, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jparrill, sdminonne

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jparrill
jparrill force-pushed the CNTRLPLANE-2678-etc-backup branch from f27d0d8 to 0519ba4 Compare March 24, 2026 09:22
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 24, 2026
@cwbotbot

cwbotbot commented Mar 24, 2026

Copy link
Copy Markdown

Test Results

e2e-aws

e2e-aks

@jparrill
jparrill force-pushed the CNTRLPLANE-2678-etc-backup branch from 0519ba4 to f33b5cd Compare March 24, 2026 11:12
@jparrill

Copy link
Copy Markdown
Contributor Author

Addressed reviewer comments + rebase to catch Konflux fixes

@openshift-ci-robot

openshift-ci-robot commented Mar 24, 2026

Copy link
Copy Markdown

@jparrill: This pull request references CNTRLPLANE-2678 which is a valid jira issue.

Details

In response to this:

Summary

  • Adapts the etcd-backup CPO subcommand to work when the backup Job runs from the HO namespace, aligning cert paths with the fetch-etcd-certs subcommand from PR CNTRLPLANE-2678: Add fetch-etcd-certs CPO subcommand for HCPEtcdBackup #8010.
  • Removes S3 upload logic from etcd-backup (upload responsibility moves to a separate etcd-upload step).
  • Adds new manifest functions for HO namespace deployment: EtcdBackupJob, EtcdBackupJobServiceAccount, EtcdBackupJobRole, EtcdBackupJobRoleBinding, EtcdBackupNetworkPolicy.
  • Preserves backward compatibility with existing EtcdBackupCronJob and EtcdBackupServiceAccount.
  • Adds integration tests validating both the new HO namespace flow (cross-namespace RBAC + NetworkPolicy + fetch-etcd-certs) and the legacy HCP namespace flow (direct volume mounts).

Dependencies

Related PRs

Test plan

  • Unit tests for etcd-backup command flags and defaults
  • Unit tests for all new manifest functions
  • Integration tests validated against a live management cluster
  • HO namespace flow: Job with fetch-etcd-certs + etcdctl snapshot + etcdutl verify
  • HCP namespace flow (legacy): Job with direct volume mounts + etcdctl snapshot + etcdutl verify
  • make verify passes

How to run integration tests

KUBECONFIG=/path/to/management-cluster/kubeconfig \
ETCD_BACKUP_TEST_HCP_NAMESPACE=clusters-my-hcp \
 go test -tags integration -v -timeout 10m ./test/integration/oadp/backup/...

Ref: CNTRLPLANE-2678

🤖 Generated with Claude Code

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 openshift-eng/jira-lifecycle-plugin repository.

… manifests

Update the etcd-backup subcommand default cert paths to align with the
fetch-etcd-certs output directory (PR openshift#8010). Add new manifest functions
for HO namespace deployment: EtcdBackupJob, EtcdBackupJobServiceAccount,
EtcdBackupJobRole, EtcdBackupJobRoleBinding, EtcdBackupNetworkPolicy.
Preserve backward compatibility with existing EtcdBackupCronJob and
EtcdBackupServiceAccount.

Ref: CNTRLPLANE-2678

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
@jparrill
jparrill force-pushed the CNTRLPLANE-2678-etc-backup branch from f33b5cd to 49f78fb Compare March 26, 2026 07:51
@jparrill
jparrill force-pushed the CNTRLPLANE-2678-etc-backup branch from 49f78fb to 1d910b0 Compare March 26, 2026 11:06

@mgencur mgencur left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just a few minor things.

Comment thread test/integration/oadp/backup/etcd_backup_test.go Outdated
Comment thread test/integration/oadp/backup/etcd_backup_test.go Outdated
Comment thread test/integration/oadp/backup/etcd_backup_test.go Outdated
Comment thread test/integration/oadp/backup/etcd_backup_test.go Outdated
Comment thread test/integration/oadp/backup/etcd_backup_test.go Outdated
…lows

Add integration tests that validate the etcd backup process against a
live management cluster. Two test scenarios are covered:

- HO namespace flow: creates cross-namespace RBAC, NetworkPolicy, and a
  Job using fetch-etcd-certs (PR openshift#8010) + etcdctl snapshot + etcdutl
  verify as a mock of the future HCPEtcdBackup controller.
- HCP namespace flow (legacy): creates a Job directly in the HCP
  namespace mounting etcd-client-tls and etcd-ca as volumes.

Both tests verify snapshot integrity via etcdutl snapshot status.

Ref: CNTRLPLANE-2678

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
@jparrill
jparrill force-pushed the CNTRLPLANE-2678-etc-backup branch from 1d910b0 to 1ffbb61 Compare March 26, 2026 14:05
@mgencur

mgencur commented Mar 26, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 26, 2026
@openshift-ci-robot

Copy link
Copy Markdown

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

@jparrill
jparrill marked this pull request as ready for review March 26, 2026 14:11
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 26, 2026
@openshift-ci
openshift-ci Bot requested review from csrwng and muraee March 26, 2026 14:11
@jparrill

Copy link
Copy Markdown
Contributor Author

/retest-required

@gaol

gaol commented Mar 27, 2026

Copy link
Copy Markdown
Contributor

I have tested the changes in this PR, it looks good to me, the test plan and report is attached in the linked Jira comment.

One query about the etcd-backup subcommand are :

@jparrill

@gaol

gaol commented Mar 27, 2026

Copy link
Copy Markdown
Contributor

/verified by @gaol

I will tag the verified label to move it forward, I don't see the changes itself leading any issue.

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 27, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@gaol: This PR has been marked as verified by @gaol.

Details

In response to this:

/verified by @gaol

I will tag the verified label to move it forward, I don't see the changes itself leading any issue.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci

openshift-ci Bot commented Mar 27, 2026

Copy link
Copy Markdown
Contributor

@jparrill: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@openshift-merge-bot
openshift-merge-bot Bot merged commit c503233 into openshift:main Mar 27, 2026
27 checks passed
LiangquanLi930 pushed a commit to LiangquanLi930/hypershift that referenced this pull request Mar 27, 2026
…ackup

CNTRLPLANE-2678: Adapt etcd-backup command and add HO namespace manifests
@hypershift-jira-solve-ci hypershift-jira-solve-ci Bot mentioned this pull request Apr 30, 2026
4 tasks
@jparrill

jparrill commented Jun 5, 2026

Copy link
Copy Markdown
Contributor Author

/jira backport release-4.21,release-4.20

@openshift-ci-robot

Copy link
Copy Markdown

@jparrill: Missing required branches for backport chain:

  • release-4.22 OR openshift-4.22,
Details

In response to this:

/jira backport release-4.21,release-4.20

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 openshift-eng/jira-lifecycle-plugin repository.

@jparrill

jparrill commented Jun 5, 2026

Copy link
Copy Markdown
Contributor Author

/jira backport release-4.22,release-4.21,release-4.20

@openshift-ci-robot

Copy link
Copy Markdown

@jparrill: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.22
/cherrypick release-4.21
/cherrypick release-4.20

Details

In response to this:

/jira backport release-4.22,release-4.21,release-4.20

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@openshift-ci-robot: #8040 failed to apply on top of branch "release-4.20":

Applying: feat(cpo): update etcd-backup cert path defaults and add HO namespace manifests
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/manifests/etcd.go
M	etcd-backup/etcdbackup.go
A	etcd-backup/etcdbackup_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): etcd-backup/etcdbackup_test.go deleted in HEAD and modified in feat(cpo): update etcd-backup cert path defaults and add HO namespace manifests. Version feat(cpo): update etcd-backup cert path defaults and add HO namespace manifests of etcd-backup/etcdbackup_test.go left in tree.
Auto-merging etcd-backup/etcdbackup.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/manifests/etcd.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 feat(cpo): update etcd-backup cert path defaults and add HO namespace manifests

Details

In response to this:

@jparrill: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.22
/cherrypick release-4.21
/cherrypick release-4.20

In response to this:

/jira backport release-4.22,release-4.21,release-4.20

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 openshift-eng/jira-lifecycle-plugin repository.

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.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@openshift-ci-robot: #8040 failed to apply on top of branch "release-4.21":

Applying: feat(cpo): update etcd-backup cert path defaults and add HO namespace manifests
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/manifests/etcd.go
M	etcd-backup/etcdbackup.go
A	etcd-backup/etcdbackup_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): etcd-backup/etcdbackup_test.go deleted in HEAD and modified in feat(cpo): update etcd-backup cert path defaults and add HO namespace manifests. Version feat(cpo): update etcd-backup cert path defaults and add HO namespace manifests of etcd-backup/etcdbackup_test.go left in tree.
Auto-merging etcd-backup/etcdbackup.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/manifests/etcd.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 feat(cpo): update etcd-backup cert path defaults and add HO namespace manifests

Details

In response to this:

@jparrill: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.22
/cherrypick release-4.21
/cherrypick release-4.20

In response to this:

/jira backport release-4.22,release-4.21,release-4.20

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 openshift-eng/jira-lifecycle-plugin repository.

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.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@openshift-ci-robot: #8040 failed to apply on top of branch "release-4.22":

Applying: feat(cpo): update etcd-backup cert path defaults and add HO namespace manifests
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/manifests/etcd.go
M	etcd-backup/etcdbackup.go
M	etcd-backup/etcdbackup_test.go
Falling back to patching base and 3-way merge...
Auto-merging etcd-backup/etcdbackup_test.go
CONFLICT (content): Merge conflict in etcd-backup/etcdbackup_test.go
Auto-merging etcd-backup/etcdbackup.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 feat(cpo): update etcd-backup cert path defaults and add HO namespace manifests

Details

In response to this:

@jparrill: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.22
/cherrypick release-4.21
/cherrypick release-4.20

In response to this:

/jira backport release-4.22,release-4.21,release-4.20

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 openshift-eng/jira-lifecycle-plugin repository.

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.

jparrill added a commit to jparrill/hypershift that referenced this pull request Jul 13, 2026
Adjust code from PRs openshift#8010, openshift#8017, openshift#8040 to compile on release-4.21:

- etcd-upload: migrate S3TransferAPI from transfermanager v0.1 API
  (PutObject/PutObjectInput) to v0.2 API (UploadObject/UploadObjectInput)
  resolved by go mod tidy on this branch. Regenerate mock accordingly.
- etcd-backup: fix mapToTags to use url.Values for proper URL-encoding
  of S3 object tag keys/values (bug exposed by backported tests).
- go.mod/vendor: add aws-sdk-go-v2 direct dependencies (config, s3,
  transfermanager) and Azure azblob SDK required by etcd-upload, then
  run go mod tidy + go mod vendor.

Ref: CNTRLPLANE-2678

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
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. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/testing Indicates the PR includes changes for e2e testing jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants