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.

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

[release-4.18] OCPBUGS-48377: Add IdleConnectionTerminationPolicy field to IngressControllerSpec #2178

Conversation

alebedev87
Copy link
Contributor

@alebedev87 alebedev87 commented Jan 29, 2025

Add an IdleConnectionTerminationPolicy field to control whether HAProxy keeps idle frontend connections open during a soft stop (router reload). Allow users to prevent errors in clients or load balancers that do not properly handle connection resets.

This PR is a manual cherry-pick of #2102 with a key difference in the default value. For OCP versions <= 4.18, the default is Deferred, aligning with older releases where HAProxy’s idle-close-on-response option was added unconditionally.

Add an `IdleConnectionTerminationPolicy` field to control whether
HAProxy keeps idle frontend connections open during a soft stop (router
reload). Allow users to prevent errors in clients or load balancers that
do not properly handle connection resets.

This commit is based on openshift#2102 with a key in the default value.
For OCP versions <= 4.18, the default is `Deferred`, aligning with older releases
where HAProxy’s `idle-close-on-response` option was added unconditionally.
Copy link
Contributor

openshift-ci bot commented Jan 29, 2025

Hello @alebedev87! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Jan 29, 2025
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 29, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jan 29, 2025
@openshift-ci-robot
Copy link

@alebedev87: This pull request references Jira Issue OCPBUGS-48377, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-43745 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-43745 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0
  • bug has dependents

Requesting review from QA contact:
/cc @lihongan

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

In response to this:

Add an IdleConnectionTerminationPolicy field to control whether HAProxy keeps idle frontend connections open during a soft stop (router reload). Allow users to prevent errors in clients or load balancers that do not properly handle connection resets.

This commit is based on #2102 with a key in the default value. For OCP versions <= 4.18, the default is Deferred, aligning with older releases where HAProxy’s idle-close-on-response option was added unconditionally.

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.

@alebedev87 alebedev87 changed the title OCPBUGS-48377: Add IdleCloseOnResponse field to IngressControllerSpec [release-4.18] OCPBUGS-48377: Add IdleCloseOnResponse field to IngressControllerSpec Jan 29, 2025
@JoelSpeed
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 29, 2025
Copy link
Contributor

openshift-ci bot commented Jan 29, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alebedev87, JoelSpeed

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 29, 2025
Copy link
Contributor

openshift-ci bot commented Jan 29, 2025

@alebedev87: all tests passed!

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.

alebedev87 added a commit to alebedev87/cluster-ingress-operator that referenced this pull request Jan 29, 2025
alebedev87 added a commit to alebedev87/cluster-ingress-operator that referenced this pull request Jan 29, 2025
go mod edit -replace github.com/openshift/api=github.com/alebedev87/api@4-18-idle-conn-termination-policy
go mod tidy
go mod vendor
make update
@gangwgr
Copy link

gangwgr commented Jan 29, 2025

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 29, 2025
@JoelSpeed
Copy link
Contributor

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 29, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit d15841b into openshift:release-4.18 Jan 29, 2025
11 checks passed
@openshift-ci-robot
Copy link

@alebedev87: Jira Issue OCPBUGS-48377: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

In response to this:

Add an IdleConnectionTerminationPolicy field to control whether HAProxy keeps idle frontend connections open during a soft stop (router reload). Allow users to prevent errors in clients or load balancers that do not properly handle connection resets.

This PR is a manual cherry-pick of #2102 with a key difference in the default value. For OCP versions <= 4.18, the default is Deferred, aligning with older releases where HAProxy’s idle-close-on-response option was added unconditionally.

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

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-config-api
This PR has been included in build ose-cluster-config-api-container-v4.18.0-202501291931.p0.gd15841b.assembly.stream.el9.
All builds following this will include this PR.

alebedev87 added a commit to alebedev87/cluster-ingress-operator that referenced this pull request Jan 29, 2025
Vendor openshift/api module to get `idleConnectionTerminationPolicy` field of IngressController API.

Vendor steps:

go mod edit -replace github.com/openshift/api=github.com/openshift/api@v0.0.0-20250129180039-d15841be6bde
go mod tidy
go mod vendor
make update
alebedev87 added a commit to alebedev87/cluster-ingress-operator that referenced this pull request Jan 30, 2025
Vendor openshift/api module to get `idleConnectionTerminationPolicy` field of IngressController API.

Vendor steps:

go mod edit -replace github.com/openshift/api=github.com/openshift/api@v0.0.0-20250129180039-d15841be6bde
go mod tidy
go mod vendor
make update
@alebedev87
Copy link
Contributor Author

/cherry-pick release-4.17

@openshift-cherrypick-robot

@alebedev87: #2178 failed to apply on top of branch "release-4.17":

Applying: OCPBUGS-48377: Add IdleCloseOnResponse field to IngressControllerSpec
Using index info to reconstruct a base tree...
M	openapi/generated_openapi/zz_generated.openapi.go
M	openapi/openapi.json
M	operator/v1/tests/ingresscontrollers.operator.openshift.io/AAA_ungated.yaml
A	operator/v1/tests/ingresscontrollers.operator.openshift.io/IngressControllerLBOpenStack.yaml
M	operator/v1/tests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml
M	operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml
M	operator/v1/types_ingress.go
M	operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers.crd.yaml
M	operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/AAA_ungated.yaml
M	operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml
M	operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml
M	operator/v1/zz_generated.swagger_doc_generated.go
Falling back to patching base and 3-way merge...
Auto-merging operator/v1/zz_generated.swagger_doc_generated.go
Auto-merging operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml
Auto-merging operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml
Auto-merging operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/AAA_ungated.yaml
Auto-merging operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers.crd.yaml
Auto-merging operator/v1/types_ingress.go
Auto-merging operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml
Auto-merging operator/v1/tests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml
CONFLICT (modify/delete): operator/v1/tests/ingresscontrollers.operator.openshift.io/IngressControllerLBOpenStack.yaml deleted in HEAD and modified in OCPBUGS-48377: Add IdleCloseOnResponse field to IngressControllerSpec. Version OCPBUGS-48377: Add IdleCloseOnResponse field to IngressControllerSpec of operator/v1/tests/ingresscontrollers.operator.openshift.io/IngressControllerLBOpenStack.yaml left in tree.
Auto-merging operator/v1/tests/ingresscontrollers.operator.openshift.io/AAA_ungated.yaml
Auto-merging openapi/openapi.json
Auto-merging openapi/generated_openapi/zz_generated.openapi.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-48377: Add IdleCloseOnResponse field to IngressControllerSpec

In response to this:

/cherry-pick release-4.17

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.

@alebedev87 alebedev87 changed the title [release-4.18] OCPBUGS-48377: Add IdleCloseOnResponse field to IngressControllerSpec [release-4.18] OCPBUGS-48377: Add IdleConnectionTerminationPolicy field to IngressControllerSpec Jan 31, 2025
alebedev87 added a commit to alebedev87/cluster-ingress-operator that referenced this pull request Feb 25, 2025
Vendor openshift/api module to get `idleConnectionTerminationPolicy` field of IngressController API.

Vendor steps:

go mod edit -replace github.com/openshift/api=github.com/openshift/api@v0.0.0-20250129180039-d15841be6bde
go mod tidy
go mod vendor
make update
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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants