-
Notifications
You must be signed in to change notification settings - Fork 189
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace liveness-grace-period-seconds annotation
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.
- Loading branch information
Showing
4 changed files
with
39 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters