Skip to content

OCPBUGS-49749: Exclude etcd readiness checks from /readyz to ignore temporary etcd hiccups #754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release-4.18
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bindata/oauth-apiserver/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ spec:
httpGet:
scheme: HTTPS
port: 8443
path: readyz
path: readyz?exclude=etcd&exclude=etcd-readiness
initialDelaySeconds: 0
periodSeconds: 5
timeoutSeconds: 10
Expand Down
5 changes: 2 additions & 3 deletions pkg/operator/workload/testdata/sync_ds_scenario_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
annotations:
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
operator.openshift.io/spec-hash: "1986a56f7e54d5a8fb43656056b747bf93c3eeea535b79bb2866562a001a3778"
operator.openshift.io/spec-hash: "dc41cb7ec4f6f82f4a8637ae233969f202c36f6acd376aca21980313af7c9f50"
creationTimestamp: ~
labels:
apiserver: "true"
Expand Down Expand Up @@ -87,7 +87,7 @@ spec:
httpGet:
scheme: HTTPS
port: 8443
path: readyz
path: readyz?exclude=etcd&exclude=etcd-readiness
initialDelaySeconds: 0
periodSeconds: 5
timeoutSeconds: 10
Expand Down Expand Up @@ -213,4 +213,3 @@ spec:
path: /var/log/oauth-apiserver
name: audit-dir
status: {}

5 changes: 2 additions & 3 deletions pkg/operator/workload/testdata/sync_ds_scenario_2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
annotations:
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
operator.openshift.io/spec-hash: "fbe2e5bff6b8355967db0b9d904e66a2a56018f85b6e488362d6d5161bde1f93"
operator.openshift.io/spec-hash: "857876e78675ca8630c8a1ef114cc9487d714ab30b0e22178ccc77ffd95012d5"
creationTimestamp: ~
labels:
apiserver: "true"
Expand Down Expand Up @@ -96,7 +96,7 @@ spec:
httpGet:
scheme: HTTPS
port: 8443
path: readyz
path: readyz?exclude=etcd&exclude=etcd-readiness
initialDelaySeconds: 0
periodSeconds: 5
timeoutSeconds: 10
Expand Down Expand Up @@ -222,4 +222,3 @@ spec:
path: /var/log/oauth-apiserver
name: audit-dir
status: {}

5 changes: 2 additions & 3 deletions pkg/operator/workload/testdata/sync_ds_scenario_3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
annotations:
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
operator.openshift.io/spec-hash: "ccb8d879eec9cdde0c99dd71a28ec2f55d94ffce29e96b74a2b126c3014f223d"
operator.openshift.io/spec-hash: "a4574abdfafd21fb9a70db6c0cd6064f940ec4d3f199a0f5d9e0ac8392500f9d"
creationTimestamp: ~
labels:
apiserver: "true"
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:
httpGet:
scheme: HTTPS
port: 8443
path: readyz
path: readyz?exclude=etcd&exclude=etcd-readiness
initialDelaySeconds: 0
periodSeconds: 5
timeoutSeconds: 10
Expand Down Expand Up @@ -217,4 +217,3 @@ spec:
path: /var/log/oauth-apiserver
name: audit-dir
status: {}