[release-4.17] OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec #2186

alebedev87 · 2025-01-31T11:21:38Z

Manual cherry-pick of #2178.

openshift-ci-robot · 2025-01-31T11:21:45Z

@alebedev87: This pull request references Jira Issue OCPBUGS-49702, which is invalid:

expected Jira Issue OCPBUGS-49702 to depend on a bug targeting a version in 4.18.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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:

Manual cherry-pick of #2178.

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 · 2025-01-31T11:21:46Z

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.

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

alebedev87 · 2025-03-05T11:42:18Z

/jira refresh

openshift-ci-robot · 2025-03-05T11:42:22Z

@alebedev87: This pull request references Jira Issue OCPBUGS-49702, which is invalid:

expected Jira Issue OCPBUGS-49702 to depend on a bug targeting a version in 4.18.0, 4.18.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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:

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

alebedev87 · 2025-03-05T11:45:32Z

/jira refresh

openshift-ci-robot · 2025-03-05T11:45:36Z

@alebedev87: This pull request references Jira Issue OCPBUGS-49702, which is invalid:

expected Jira Issue OCPBUGS-49702 to depend on a bug targeting a version in 4.18.0, 4.18.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

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.

alebedev87 · 2025-03-05T11:47:26Z

/jira refresh

openshift-ci-robot · 2025-03-05T11:47:33Z

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

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.17.z) matches configured target version for branch (4.17.z)
bug is in the state ASSIGNED, 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-48377 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-48377 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
bug has dependents

Requesting review from QA contact:
/cc @lihongan

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.

Vendor openshift/api module to get `idleConnectionTerminationPolicy` field of IngressController API. Vendor steps: go mod edit -replace github.com/openshift/api=github.com/openshift/[email protected] go mod tidy go mod vendor make update

lihongan · 2025-04-29T01:27:07Z

/label qe-approved

openshift-ci-robot · 2025-04-29T01:27:12Z

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

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.17.z) matches configured target version for branch (4.17.z)
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-48377 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-48377 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
bug has dependents

Requesting review from QA contact:
/cc @lihongan

In response to this:

Manual cherry-pick of #2178.

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.

JoelSpeed · 2025-04-29T09:10:37Z

/lgtm
/label backport-risk-assessed

openshift-ci · 2025-04-29T09:11:17Z

[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:

~~OWNERS~~ [JoelSpeed]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

gangwgr · 2025-04-29T12:10:37Z

/label cherry-pick-approved

openshift-ci · 2025-04-29T12:42:08Z

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

openshift-ci-robot · 2025-04-29T12:46:06Z

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

openshift/api#2186

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

openshift/router#652 is open

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-49702 has not been moved to the MODIFIED state.

In response to this:

Manual cherry-pick of #2178.

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.

Vendor openshift/api module to get `idleConnectionTerminationPolicy` field of IngressController API. Vendor steps: go mod edit -replace github.com/openshift/api=github.com/openshift/[email protected] go mod tidy go mod vendor make update

openshift-bot · 2025-04-29T13:54:10Z

[ART PR BUILD NOTIFIER]

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

alebedev87 · 2025-05-19T09:28:14Z

/cherry-pick release-4.16

openshift-cherrypick-robot · 2025-05-19T09:29:18Z

@alebedev87: #2186 failed to apply on top of branch "release-4.16":

Applying: OCPBUGS-49702: Add IdleConnectionTerminationPolicy 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/IngressControllerLBSubnetsAWS.yaml
A	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
A	operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml
A	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
CONFLICT (modify/delete): operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml deleted in HEAD and modified in OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec. Version OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec of operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml left in tree.
CONFLICT (modify/delete): operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml deleted in HEAD and modified in OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec. Version OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec of operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml left in tree.
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
CONFLICT (modify/delete): operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml deleted in HEAD and modified in OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec. Version OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec of operator/v1/tests/ingresscontrollers.operator.openshift.io/SetEIPForNLBIngressController.yaml left in tree.
CONFLICT (modify/delete): operator/v1/tests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.yaml deleted in HEAD and modified in OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec. Version OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec of operator/v1/tests/ingresscontrollers.operator.openshift.io/IngressControllerLBSubnetsAWS.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-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec

In response to this:

/cherry-pick release-4.16

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 · 2025-05-19T09:46:14Z

Manual cherry pick: #2330.

openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 31, 2025

openshift-ci bot requested review from deads2k and derekwaynecarr January 31, 2025 11:22

alebedev87 changed the title ~~OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec~~ [release-4.17] OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec Jan 31, 2025

alebedev87 force-pushed the 4-17-idle-conn-termination-policy branch from 3e90081 to 40536da Compare February 3, 2025 13:26

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 Mar 5, 2025

openshift-ci bot requested a review from lihongan March 5, 2025 11:47

alebedev87 mentioned this pull request Apr 28, 2025

[release-4.17] OCPBUGS-49702: Add support for IdleConnectionTerminationPolicy openshift/cluster-ingress-operator#1223

Merged

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Apr 29, 2025

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 29, 2025

openshift-ci bot assigned gangwgr and wangke19 Apr 29, 2025

openshift-ci bot assigned xingxingxia and JoelSpeed Apr 29, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2025

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

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 Apr 29, 2025

openshift-merge-bot bot merged commit ace59d6 into openshift:release-4.17 Apr 29, 2025
10 checks passed

openshift-ci-robot mentioned this pull request May 16, 2025

[release-4.17] OCPBUGS-49702: Add support for IdleCloseTerminationPolicy openshift/router#652

Merged

alebedev87 mentioned this pull request May 19, 2025

[release-4.16] OCPBUGS-56424: Add IdleConnectionTerminationPolicy field to IngressControllerSpec #2330

Merged

microshift-rebase-script bot mentioned this pull request May 26, 2025

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-05-23-045753_amd64-2025-05-23_arm64-2025-05-23 openshift/microshift#4964

Merged

openshift-ci-robot mentioned this pull request Jul 1, 2025

[release-4.17] OCPBUGS-49702: Add e2e tests for IdleConnectionTerminationPolicy openshift/cluster-ingress-operator#1225

Merged

[release-4.17] OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec #2186

[release-4.17] OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec #2186

Uh oh!

Conversation

alebedev87 commented Jan 31, 2025

Uh oh!

openshift-ci-robot commented Jan 31, 2025

Uh oh!

openshift-ci bot commented Jan 31, 2025

Uh oh!

alebedev87 commented Mar 5, 2025

Uh oh!

openshift-ci-robot commented Mar 5, 2025

Uh oh!

alebedev87 commented Mar 5, 2025

Uh oh!

openshift-ci-robot commented Mar 5, 2025

Uh oh!

alebedev87 commented Mar 5, 2025

Uh oh!

openshift-ci-robot commented Mar 5, 2025

Uh oh!

lihongan commented Apr 29, 2025

Uh oh!

openshift-ci-robot commented Apr 29, 2025

Uh oh!

JoelSpeed commented Apr 29, 2025

Uh oh!

openshift-ci bot commented Apr 29, 2025

Uh oh!

gangwgr commented Apr 29, 2025

Uh oh!

openshift-ci bot commented Apr 29, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 29, 2025

Uh oh!

openshift-bot commented Apr 29, 2025

Uh oh!

alebedev87 commented May 19, 2025

Uh oh!

openshift-cherrypick-robot commented May 19, 2025

Uh oh!

alebedev87 commented May 19, 2025

Uh oh!

Uh oh!