Add CA bundle volume mount and validation for MCPRemoteProxy#4190
Open
majiayu000 wants to merge 10 commits intostacklok:mainfrom
Open
Add CA bundle volume mount and validation for MCPRemoteProxy#4190majiayu000 wants to merge 10 commits intostacklok:mainfrom
majiayu000 wants to merge 10 commits intostacklok:mainfrom
Conversation
MCPRemoteProxy was missing CA bundle support that already existed in MCPServer. This adds two features: 1. OIDC CA bundle volume mount in buildVolumesForProxy() so that custom CA certificates are available to the proxy container. 2. CA bundle ConfigMap validation in validateAndHandleConfigs() that checks the referenced ConfigMap exists and contains the expected key, setting appropriate status conditions. Signed-off-by: majiayu000 <1835304752@qq.com>
majiayu000
requested review from
ChrisJBurns,
JAORMX,
jerm-dro,
jhrozek and
yrobla
as code owners
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4190 +/- ##
==========================================
+ Coverage 68.85% 69.25% +0.40%
==========================================
Files 467 477 +10
Lines 46983 48120 +1137
==========================================
+ Hits 32349 33326 +977
- Misses 11974 12217 +243
+ Partials 2660 2577 -83 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
github-actions
bot
added
size/M
Collaborator
|
Are there any integration tests that we can add to this? |
Add WithCABundleRef builder helper and 4 integration test cases to verify the CA bundle ConfigMap reference validation end-to-end: valid ConfigMap with correct key, missing ConfigMap, wrong key in ConfigMap, and no CA bundle configured. Signed-off-by: majiayu000 <1835304752@qq.com>
github-actions
bot
added
size/M
Add three additional test cases to TestMCPRemoteProxyValidateCABundleRef: - CABundleRef with nil ConfigMapRef (early return branch) - CABundleRef with empty ConfigMap name (ValidateCABundleSource error) - Valid CABundleRef with default key fallback (empty key branch) This brings validateCABundleRef to 100% coverage. Signed-off-by: majiayu000 <1835304752@qq.com>
github-actions
bot
added
size/M
…resolution Cover previously untested branches in validateOIDCIssuerURL, validateJWKSURL, and serviceAccountNameForRemoteProxy to address Codecov patch coverage gaps. Signed-off-by: majiayu000 <1835304752@qq.com>
github-actions
bot
added
size/L
Cover missing Codecov branches: inline OIDC HTTP issuer rejection, inline JWKS URL validation, authz ConfigMap reference errors, header secret reference errors, and nil ValueSecretRef skip path. Signed-off-by: majiayu000 <1835304752@qq.com>
github-actions
bot
added
size/XL
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Large PR Detected
This PR exceeds 1000 lines of changes and requires justification before it can be reviewed.
How to unblock this PR:
Add a section to your PR description with the following format:
## Large PR Justification
[Explain why this PR must be large, such as:]
- Generated code that cannot be split
- Large refactoring that must be atomic
- Multiple related changes that would break if separated
- Migration or data transformationAlternative:
Consider splitting this PR into smaller, focused changes (< 1000 lines each) for easier review and reduced risk.
See our Contributing Guidelines for more details.
This review will be automatically dismissed once you add the justification section.
Cover uncovered branches flagged by Codecov: - validateOIDCIssuerURL/validateJWKSURL with nil config structs - validateSpec with unsupported OIDC issuer scheme - ensureService update path with drifted session affinity Signed-off-by: majiayu000 <1835304752@qq.com>
github-actions
bot
added
size/XL
…bset check Cover remaining Codecov-flagged branches: - updateCABundleStatusForProxy error path (Status().Update failure) - deploymentMetadataNeedsUpdate with MapIsSubset annotation check Signed-off-by: majiayu000 <1835304752@qq.com>
…nd handleExternalAuthConfig Signed-off-by: majiayu000 <1835304752@qq.com>
github-actions
bot
added
size/XL
Signed-off-by: majiayu000 <1835304752@qq.com>
github-actions
bot
added
size/XL
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
AddOIDCCABundleVolumes()call inbuildVolumesForProxy()to mount CA bundle ConfigMaps into the proxy containervalidateCABundleRef()method to the reconciler that validates the referenced ConfigMap exists and contains the expected key, mirroring the MCPServer patternConditionTypeMCPRemoteProxyCABundleRefValidatedcondition type for status reportingFixes #4113
Type of change
Changes
mcpremoteproxy_types.goConditionTypeMCPRemoteProxyCABundleRefValidatedconstantmcpremoteproxy_deployment.goAddOIDCCABundleVolumes()call inbuildVolumesForProxy()mcpremoteproxy_controller.govalidateCABundleRef(),updateCABundleStatusForProxy(),setCABundleRefConditionForProxy()methods and call fromvalidateAndHandleConfigs()mcpremoteproxy_deployment_test.gomcpremoteproxy_controller_test.goTestMCPRemoteProxyValidateCABundleRefwith 4 casesTest plan
go build ./...passestask lint-fixpasses with 0 issuesgo test ./cmd/thv-operator/controllers/...passesDoes this introduce a user-facing change?
MCPRemoteProxy now supports OIDC CA bundle ConfigMap references, matching the existing MCPServer behavior. Users can configure custom CA certificates for OIDC providers by setting
caBundlein their OIDC configuration.