Bug 1918371: Add "ingress.operator.openshift.io/hard-stop-after" annotation

[frobware]

This is a manual backport of #522

Annotating either an ingresscontroller or the ingress config with this
new annoation will redeploy the router and that will configure haproxy
to emit the haproxy "hard-stop-after" global option.

An ingresscontroller with a valid annotation set will override
ingresses.config/cluster (if set).

Examples:

Annotating the ingress config:

$ oc annotate ingresses.config/cluster ingress.operator.openshift.io/hard-stop-after=1h

Annotating the "default" ingresscontroller:

$ oc -n openshift-ingress-operator annotate ingresscontrollers/default ingress.operator.openshift.io/hard-stop-after=30m

[openshift-ci-robot]

@frobware: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.6] Add "ingress.operator.openshift.io/hard-stop-after" annotation

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/test-infra repository.

[openshift-ci-robot]

@frobware: This pull request references Bugzilla bug 1918371, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.6.z) matches configured target release for branch (4.6.z)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
• dependent bug Bugzilla bug 1905100 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
• dependent Bugzilla bug 1905100 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
• bug has dependents

In response to this:

Bug 1918371: Add "ingress.operator.openshift.io/hard-stop-after" annotation

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/test-infra repository.

[frobware]

/cherry-pick release-4.5

[openshift-cherrypick-robot]

@frobware: once the present PR merges, I will cherry-pick it on top of release-4.5 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.5

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/test-infra repository.

[sgreene570]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: frobware, sgreene570

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 [frobware,sgreene570]

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

[sgreene570]

/hold since openshift/router#239 needs to be backported first.

[frobware]

This and openshift/router#249 are a pair.

[frobware]

Cancelling the hold.
This PR also requires openshift/router#249.
/hold cancel

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-ci-robot]

@frobware: All pull requests linked via external trackers have merged:

• openshift/cluster-ingress-operator#535
• openshift/router#249

Bugzilla bug 1918371 has been moved to the MODIFIED state.

In response to this:

Bug 1918371: Add "ingress.operator.openshift.io/hard-stop-after" annotation

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/test-infra repository.

[openshift-cherrypick-robot]

@frobware: #535 failed to apply on top of branch "release-4.5":

Applying: Add "ingress.operator.openshift.io/hard-stop-after" annotation
Using index info to reconstruct a base tree...
M	pkg/operator/controller/ingress/deployment.go
M	pkg/operator/controller/ingress/deployment_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/controller/ingress/deployment_test.go
CONFLICT (content): Merge conflict in pkg/operator/controller/ingress/deployment_test.go
Auto-merging pkg/operator/controller/ingress/deployment.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add "ingress.operator.openshift.io/hard-stop-after" annotation
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.5

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/test-infra repository.