api
api copied to clipboard
openshift
[release-4.17] OCPBUGS-49702: Add IdleConnectionTerminationPolicy field to IngressControllerSpec
@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 https://github.com/openshift/api/pull/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.
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[bot] avatar](https://avatars.githubusercontent.com/in/91280?v=4 "Published by a pub.dev verified publisher"){kind=small}
@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: 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: 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.
@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 https://github.com/openshift/api/pull/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.
[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
- ~~OWNERS~~ [JoelSpeed]
Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment
@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: Jira Issue OCPBUGS-49702: Some pull requests linked via external trackers have merged:
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 https://github.com/openshift/api/pull/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.
[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: #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.
