Skip to content

[oadp-dev] OADP-6765: feat(bsl): concatenate all CA certificates from BSLs and include system defaults - #1972

Merged
openshift-merge-bot[bot] merged 6 commits into
openshift:oadp-devfrom
openshift-cherrypick-robot:cherry-pick-1969-to-oadp-dev
Oct 6, 2025
Merged

openshift-merge-bot[bot] merged 6 commits into
openshift:oadp-devfrom
openshift-cherrypick-robot:cherry-pick-1969-to-oadp-dev

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown
Contributor

This is an automated cherry-pick of #1969

/assign kaovilai

kaovilai and others added 6 commits September 30, 2025 16:23
…em defaults

Instead of using "first one wins" approach, now collects and concatenates all
unique CA certificates from BackupStorageLocations. Also includes system default
CA certificates when custom certificates are present.

Changes:
- Modified processCACertForBSLs() to collect all unique CA certificates
- Added deduplication logic to avoid including same certificate multiple times
- Added getSystemCACertificates() helper to retrieve system CA bundles
- System defaults are only included when custom CAs are present
- Updated tests to verify concatenation and deduplication behavior

This allows for more flexible multi-cloud/multi-endpoint configurations where
different BSLs may require different CA certificates.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
… conflicts with Velero management

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
…d tests for validation

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
…lder:ubi9-v1.23 sh -c "make lint-fix"`

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
…e with e2e

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
…e test files

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
@openshift-ci-robot

openshift-ci-robot commented Sep 30, 2025 •

Copy link
Copy Markdown

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: OADP-6765

Details

In response to this:

This is an automated cherry-pick of #1969

/assign kaovilai

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.

@kaovilai kaovilai changed the title [oadp-dev] oadp-1.5: OADP-6765: feat(bsl): concatenate all CA certificates from BSLs and include system defaults [oadp-dev] OADP-6765: feat(bsl): concatenate all CA certificates from BSLs and include system defaults Sep 30, 2025
@openshift-ci
openshift-ci Bot requested review from eemcmullan and sseago September 30, 2025 16:45
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 30, 2025
@kaovilai

kaovilai commented Oct 2, 2025

Copy link
Copy Markdown
Member

/retest

1 similar comment
@kaovilai

kaovilai commented Oct 3, 2025

Copy link
Copy Markdown
Member

/retest

@shubham-pampattiwar

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 6, 2025
@openshift-ci-robot

Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD e7249fd and 2 for PR HEAD 43a0f52 in total

@kaovilai

kaovilai commented Oct 6, 2025

Copy link
Copy Markdown
Member

/retest

@openshift-ci

openshift-ci Bot commented Oct 6, 2025

Copy link
Copy Markdown

@openshift-cherrypick-robot: 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-ci

openshift-ci Bot commented Oct 6, 2025

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, shubham-pampattiwar, weshayutin

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:
  • OWNERS [shubham-pampattiwar]

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

@openshift-merge-bot
openshift-merge-bot Bot merged commit 9bfd582 into openshift:oadp-dev Oct 6, 2025
14 checks passed
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants