Skip to content

NE-2333: Add support for TLS curves in HAProxy configuration#755

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
richardsonnick:router-curves
Mar 31, 2026
Merged

NE-2333: Add support for TLS curves in HAProxy configuration#755
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
richardsonnick:router-curves

Conversation

@richardsonnick
Copy link
Copy Markdown
Contributor

Introduces the ROUTER_CURVES environment variable which maps directly to HAProxy's ssl-default-bind-curves directive, allowing operators to configure the TLS key exchange groups used by the router. When ROUTER_CURVES is not set, no directive is emitted and HAProxy uses its built-in defaults.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 27, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 7fb61bfd-3cfb-4f2a-bd76-ab72d4d69ce6

📥 Commits

Reviewing files that changed from the base of the PR and between 57ddf89 and 8997b3d.

📒 Files selected for processing (1)
  • images/router/haproxy/conf/haproxy-config.template

Walkthrough

The HAProxy configuration template now conditionally emits an ssl-default-bind-curves <value> directive in the global section when the ROUTER_CURVES environment variable is set.

Changes

Cohort / File(s) Summary
HAProxy Configuration Template
images/router/haproxy/conf/haproxy-config.template
Adds a conditional ssl-default-bind-curves directive in the global section that outputs the value of ROUTER_CURVES when configured.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

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

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

@candita
Copy link
Copy Markdown
Contributor

candita commented Mar 27, 2026

/retitle NE-2332: Add support for TLS curves in HAProxy configuration

@openshift-ci openshift-ci Bot changed the title Add support for TLS curves in HAProxy configuration NE-2332: Add support for TLS curves in HAProxy configuration Mar 27, 2026
@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 27, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 27, 2026

@richardsonnick: This pull request references NE-2332 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:

Introduces the ROUTER_CURVES environment variable which maps directly to HAProxy's ssl-default-bind-curves directive, allowing operators to configure the TLS key exchange groups used by the router. When ROUTER_CURVES is not set, no directive is emitted and HAProxy uses its built-in defaults.

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.

@Miciah
Copy link
Copy Markdown
Contributor

Miciah commented Mar 27, 2026

/approve
/lgtm

Thanks for your patience and responsiveness!

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 27, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 27, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 27, 2026
Comment thread images/router/haproxy/conf/haproxy-config.template
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 27, 2026
Introduces the ROUTER_CURVES environment variable which maps directly to
HAProxy's ssl-default-bind-curves directive, allowing operators to configure
the TLS key exchange groups used by the router. When ROUTER_CURVES is not
set, no directive is emitted and HAProxy uses its built-in defaults.
@Miciah
Copy link
Copy Markdown
Contributor

Miciah commented Mar 27, 2026

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 27, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 28, 2026

@richardsonnick: 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.

@Miciah
Copy link
Copy Markdown
Contributor

Miciah commented Mar 30, 2026

/payload-job periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-upgrade-fips

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 30, 2026

@Miciah: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-upgrade-fips

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/34159260-2c54-11f1-89b2-7977742c8eef-0

@lihongan
Copy link
Copy Markdown

/verified by @lihongan

// it is working on FIPS cluster
$ oc get clusterversion
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.22.0-0-2026-03-31-012306-test-ci-ln-nf1j9gb-latest   True        False         50m     Cluster version is 4.22.0-0-2026-03-31-012306-test-ci-ln-nf1j9gb-latest

sh-5.1$ grep curve haproxy.config 
sh-5.1$ grep curve haproxy-config.template 
  ssl-default-bind-curves {{ . }}
sh-5.1$

// after scaling down CVO/CIO, we could set env ROUTER_CURVES to change the default
$ oc -n openshift-ingress get deployment/router-default -oyaml | grep CURVES -A1
        - name: ROUTER_CURVES
          value: P-256

sh-5.1$ grep curve haproxy.config 
  ssl-default-bind-curves P-256

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 31, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

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

Details

In response to this:

/verified by @lihongan

// it is working on FIPS cluster
$ oc get clusterversion
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.22.0-0-2026-03-31-012306-test-ci-ln-nf1j9gb-latest   True        False         50m     Cluster version is 4.22.0-0-2026-03-31-012306-test-ci-ln-nf1j9gb-latest

sh-5.1$ grep curve haproxy.config 
sh-5.1$ grep curve haproxy-config.template 
 ssl-default-bind-curves {{ . }}
sh-5.1$

// after scaling down CVO/CIO, we could set env ROUTER_CURVES to change the default
$ oc -n openshift-ingress get deployment/router-default -oyaml | grep CURVES -A1
       - name: ROUTER_CURVES
         value: P-256

sh-5.1$ grep curve haproxy.config 
 ssl-default-bind-curves P-256

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-merge-bot openshift-merge-bot Bot merged commit 8963907 into openshift:master Mar 31, 2026
11 checks passed
@lihongan
Copy link
Copy Markdown

lihongan commented Apr 2, 2026

Change included in accepted release 4.22.0-0.nightly-2026-04-01-092906

@candita
Copy link
Copy Markdown
Contributor

candita commented Apr 7, 2026

Replaces #678

@candita
Copy link
Copy Markdown
Contributor

candita commented Apr 7, 2026

/retitle NE-2333: Add support for TLS curves in HAProxy configuration

@openshift-ci openshift-ci Bot changed the title NE-2332: Add support for TLS curves in HAProxy configuration NE-2333: Add support for TLS curves in HAProxy configuration Apr 7, 2026
@candita
Copy link
Copy Markdown
Contributor

candita commented Apr 7, 2026

/jira refresh

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. 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.

5 participants