OCPBUGS-4703: Replace liveness-grace-period-seconds annotation #863
Conversation
openshift-ci-robot
added
the
jira/valid-bug
|
@Miciah: This pull request references Jira Issue OCPBUGS-4703, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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
added
the
bugzilla/valid-bug
|
/retest-required |
|
/assign @gcs278 |
| @@ -1438,6 +1439,15 @@ func TestDeploymentConfigChanged(t *testing.T) { | |||
| }, | |||
| expect: true, | |||
| }, | |||
| { | |||
There was a problem hiding this comment.
Should we add a test case for detecting the changing of deployment.Spec.Template.Spec.Containers[0].LivenessProbe.terminationGracePeriodSeconds? Or maybe it could be added to one of the test cases above?
There was a problem hiding this comment.
I added a test case for it.
Remove the "unsupported.do-not-use.openshift.io/override-liveness-grace-period-seconds" annotation from router pods, and instead set terminationGracePeriodSeconds on the pods' liveness probes. Previously, cluster-ingress-operator started setting this OpenShift-specific annotation on router pods as a short-term measure to configure the liveness probe's grace period in order to fix BZ#1899941. This annotation was implemented by a carry patch in openshift/kubernetes. Since then, upstream Kubernetes has added the terminationGracePeriodSeconds field for configuring probes. Using the new API field enables us to remove the carry patch. This commit is related to bug 1899941. https://bugzilla.redhat.com/show_bug.cgi?id=1899941 Follow-up to commit 4017234. This commit fixes OCPBUGS-4703. https://issues.redhat.com/browse/OCPBUGS-4703 * assets/router/deployment.yaml: Remove the unsupported annotation, and specify terminationGracePeriodSeconds on the liveness probe. * pkg/manifests/bindata.go: Regenerate. * pkg/operator/controller/ingress/deployment.go (deploymentConfigChanged): Remove annotations that the operator owns when those annotations are not expected to be set. (copyProbe): Copy the terminationGracePeriodSeconds field. * pkg/operator/controller/ingress/deployment_test.go (TestDesiredRouterDeploymentSpecTemplate): Expect the unsupported annotation not to be set. Expect terminationGracePeriodSeconds to be set on the liveness probe. (TestDeploymentConfigChanged): Verify that deploymentConfigChanged correctly sets the liveness probe's termination grace period seconds and removes the unsupported annotation.
Miciah
force-pushed
the
OCPBUGS-4703-replace-liveness-grace-period-seconds-annotation
branch
from
c0652c9
to
cacbafd
Compare
openshift-ci-robot
added
the
jira/severity-moderate
|
@Miciah: This pull request references Jira Issue OCPBUGS-4703, which is valid. 3 validation(s) were run on this bug
In response to this:
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. |
|
Seems like a straightforward change. Should I also do an approve on this? |
|
I'm fine if you want to approve this since we didn't assign a second reviewer. * grin * . |
|
🚢 |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: gcs278 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 |
openshift-ci
bot
added
the
approved
|
/retest-required |
|
Using the pre merge verification the bug is verified and steps are attached in the comments of https://issues.redhat.com/browse/OCPBUGS-4703 |
openshift-ci
bot
added
the
qe-approved
|
/test e2e-gcp-ovn-serial |
|
/retest-required |
|
/retest |
|
/retest-required |
|
@Miciah: The following test failed, say
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/test-infra repository. I understand the commands that are listed here. |
|
/jira refresh The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target OCP 4.12), recalculating validity. |
|
/bugzilla refresh The requirements for Bugzilla bugs have changed (BZs linked to PRs on main branch need to target OCP 4.12), recalculating validity. |
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-4703, which is valid. 3 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
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-bot: No Bugzilla bug is referenced in the title of this pull request. Retaining the bugzilla/valid-bug label as it was manually added. In response to this:
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. |
|
@Miciah: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-4703 has been moved to the MODIFIED state. In response to this:
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. |
Remove the "unsupported.do-not-use.openshift.io/override-liveness-grace-period-seconds" annotation from router pods, and instead set
terminationGracePeriodSecondson the pods' liveness probes.Previously, cluster-ingress-operator started setting this OpenShift-specific annotation on router pods as a short-term measure to configure the liveness probe's grace period in order to fix BZ#1899941. This annotation was implemented by a carry patch in openshift/kubernetes. Since then, upstream Kubernetes has added the
terminationGracePeriodSecondsfield for configuring probes. Using the new API field enables us to remove the carry patch.Follow-up to #534.
assets/router/deployment.yaml: Remove the unsupported annotation, and specifyterminationGracePeriodSecondson the liveness probe.pkg/manifests/bindata.go: Regenerate.pkg/operator/controller/ingress/deployment.go(deploymentConfigChanged): Remove annotations that the operator owns when those annotations are not expected to be set.(
copyProbe): Copy theterminationGracePeriodSecondsfield.pkg/operator/controller/ingress/deployment_test.go(TestDesiredRouterDeploymentSpecTemplate): Expect the unsupported annotation not to be set. ExpectterminationGracePeriodSecondsto be set on the liveness probe.(
TestDeploymentConfigChanged): Verify thatdeploymentConfigChangedcorrectly sets the liveness probe's termination grace period seconds and removes the unsupported annotation.