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.

Sign up for GitHub

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

Jump to bottom

OCPBUGS-44236: Use system trust bundle in CPO IDP https client #5241

Merged
merged 1 commit into from
Dec 6, 2024
Merged

OCPBUGS-44236: Use system trust bundle in CPO IDP https client #5241

merged 1 commit into from
Dec 6, 2024

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Dec 5, 2024

What this PR does / why we need it:
Before this change, if a custom CA was configured for either the proxy or a particular IDP, the CPO client would get built with an empty bundle that only included the specified CAs but not the system trust bundle. This prevented connections to IDP endpoints with publicly trusted certificates. This changes the https client for IDP endpoins in the CPO to include the system trust bundle in the CAs it trusts.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #OCPBUGS-44236

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

@csrwng
Use system trust bundle in CPO IDP https client
70f089f 
Before this change, if a custom CA was configured for either the proxy
or a particular IDP, the CPO client would get built with an empty bundle
that only included the specified CAs but not the system trust bundle.
This prevented connections to IDP endpoints with publicly trusted
certificates. This changes the https client for IDP endpoins in the CPO
to include the system trust bundle in the CAs it trusts.
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 5, 2024
@openshift-ci-robot
Copy link

@csrwng: This pull request references Jira Issue OCPBUGS-44236, which is invalid:

  • expected the bug to target the "4.19.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

What this PR does / why we need it:
Before this change, if a custom CA was configured for either the proxy or a particular IDP, the CPO client would get built with an empty bundle that only included the specified CAs but not the system trust bundle. This prevented connections to IDP endpoints with publicly trusted certificates. This changes the https client for IDP endpoins in the CPO to include the system trust bundle in the CAs it trusts.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #OCPBUGS-44236

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

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 requested review from enxebre and hasueki December 5, 2024 21:05
@openshift-ci openshift-ci bot added 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. and removed do-not-merge/needs-area labels Dec 5, 2024
@csrwng
Copy link
Contributor Author

csrwng commented Dec 5, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 5, 2024
@openshift-ci-robot
Copy link

@csrwng: This pull request references Jira Issue OCPBUGS-44236, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiezhao@redhat.com), skipping review request.

In response to this:

/jira refresh

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.

@sjenning
Copy link
Contributor

sjenning commented Dec 6, 2024

/approve
/override ci/prow/e2e-kubevirt-aws-ovn-reduced

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 6, 2024

@sjenning: Overrode contexts on behalf of sjenning: ci/prow/e2e-kubevirt-aws-ovn-reduced

In response to this:

/approve
/override ci/prow/e2e-kubevirt-aws-ovn-reduced

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-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, sjenning

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

The pull request process is described here

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

@bryan-cox
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 6, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0c67adf and 2 for PR HEAD 70f089f in total

@sjenning
Copy link
Contributor

sjenning commented Dec 6, 2024

/override ci/prow/e2e-kubevirt-aws-ovn-reduced

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 6, 2024

@sjenning: Overrode contexts on behalf of sjenning: ci/prow/e2e-kubevirt-aws-ovn-reduced

In response to this:

/override ci/prow/e2e-kubevirt-aws-ovn-reduced

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-merge-bot openshift-merge-bot bot merged commit 477d939 into openshift:main Dec 6, 2024
10 of 11 checks passed
@openshift-ci-robot
Copy link

@csrwng: Jira Issue OCPBUGS-44236: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-44236 has been moved to the MODIFIED state.

In response to this:

What this PR does / why we need it:
Before this change, if a custom CA was configured for either the proxy or a particular IDP, the CPO client would get built with an empty bundle that only included the specified CAs but not the system trust bundle. This prevented connections to IDP endpoints with publicly trusted certificates. This changes the https client for IDP endpoins in the CPO to include the system trust bundle in the CAs it trusts.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #OCPBUGS-44236

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

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
Copy link
Contributor

openshift-ci bot commented Dec 6, 2024

@csrwng: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn 70f089f link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

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.

@muraee muraee mentioned this pull request Dec 16, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@enxebre enxebre Awaiting requested review from enxebre

@hasueki hasueki Awaiting requested review from hasueki

Assignees

@bryan-cox bryan-cox

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 jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@csrwng @openshift-ci-robot @sjenning @bryan-cox