[cherry-pick: release-v0.80.x] feat: add ML-KEM group to nginx for PQC readiness#3726
Merged
tekton-robot merged 1 commit intoJul 14, 2026
Merged
Conversation
The OpenShift TLS FAQ mandates that every TLS 1.3 server negotiate ML-KEM if the client supports it. nginx/OpenSSL requires an explicit ssl_ecdh_curve directive to advertise post-quantum groups; without it the TLS scanner reports pqc_capable=false. tlsECDHGroups() emits ssl_ecdh_curve based on FIPS mode: Non-FIPS: X25519MLKEM768:X25519:P-256:P-384:P-521 FIPS: P-256:P-384:P-521 X25519MLKEM768 and X25519 are not FIPS 140-approved: OpenSSL's FIPS provider rejects them with a fatal error that crashes nginx. Only the NIST prime curves (P-256, P-384, P-521) are accepted in FIPS mode. isFIPSEnabled() detects FIPS by reading /proc/sys/crypto/fips_enabled, which is accessible from containers via the shared host kernel. The group list is hardcoded until library-go's ObserveTLSSecurityProfile exposes the groups field from the APIServer TLS profile (openshift/library-go#2347, currently open). At that point the hardcoded list will be replaced by dynamic propagation. Verified on a live FIPS cluster: pipelines-console-plugin 1/1 Running, no nginx crash. Signed-off-by: Jawed khelil <jkhelil@redhat.com> Assisted-by: Claude Sonnet 4.6 (via Cursor) Co-authored-by: Cursor <cursoragent@cursor.com>
7 tasks
tekton-robot
added
do-not-merge/release-note-label-needed
Member
|
/release-note-none |
tekton-robot
added
release-note-none
Member
|
/approve |
tekton-robot
added
lgtm
pramodbindal
approved these changes
Jul 14, 2026
Contributor
Author
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: pramodbindal The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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
3 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.
This is a cherry-pick of #3713
Summary
pqc_capable=trueis a mandatory requirement)ssl_ecdh_curvedirective to advertise post-quantum groups; Go-based components get this for free via Go 1.24+ but nginx does nottlsECDHGroups()that always emitsssl_ecdh_curve, with a FIPS gate to prevent nginx crashesWhat changes
console_plugin_reconciler.go:tlsECDHGroups()— returnsX25519MLKEM768:X25519:secp256r1:secp384r1on non-FIPS clusters,X25519:secp256r1:secp384r1on FIPS clustersisFIPSEnabled()— reads/proc/sys/crypto/fips_enabled(kernel file, readable from containers without privileges)fipsEnabledPath— package-level var so tests can override it with a temp fileWhy FIPS gating is needed:
X25519MLKEM768is not FIPS-approved. OpenSSL's FIPS provider rejects it with a fatal error that crashes nginx:Why hardcoded (not from APIServer):
library-go'sObserveTLSSecurityProfiledoes not yet expose thegroupsfield from the APIServer TLS profile. The tracking PR is openshift/library-go#2347 (open). Once merged, the hardcoded list will be replaced by dynamic propagation from the APIServer profile.Test plan
TestIsFIPSEnabled— verifies all three states: missing file,0,1TestTLSECDHGroups— verifies ML-KEM included on non-FIPS, excluded on FIPS (using temp file override)TestBuildNginxTLSDirectives— all cases assertssl_ecdh_curve X25519MLKEM768:X25519:secp256r1:secp384r1TestGenerateNginxConfWithTLS— end-to-end nginx.conf generationTestNginxTLSIntegration— full reconciler integrationpqc_capable=truepqc_capable=false(acceptable per crypto team guidance)Made with Cursor