Skip to content

Commit 9ae80aa

Browse files
committed
Exclude etcd readiness checks from /readyz to ignore temporary etcd hiccups
Explicitly exclude etcd and etcd-readiness checks (OCPBUGS-48177) and have etcd operator take responsibility for properly reporting etcd readiness. Justification: kube-apiserver instances get removed from a load balancer when etcd starts to report not ready (as will KA's /readyz). Client connections can withstand etcd unreadiness longer than the readiness timeout is. Thus, it is not necessary to drop connections in case etcd resumes its readiness before a client connection times out naturally.
1 parent e8c7c47 commit 9ae80aa

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

bindata/oauth-apiserver/deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ spec:
130130
httpGet:
131131
scheme: HTTPS
132132
port: 8443
133-
path: readyz
133+
path: readyz?exclude=etcd&exclude=etcd-readiness
134134
initialDelaySeconds: 0
135135
periodSeconds: 5
136136
timeoutSeconds: 10

pkg/operator/workload/testdata/sync_ds_scenario_1.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Deployment
33
metadata:
44
annotations:
55
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
6-
operator.openshift.io/spec-hash: "1986a56f7e54d5a8fb43656056b747bf93c3eeea535b79bb2866562a001a3778"
6+
operator.openshift.io/spec-hash: "dc41cb7ec4f6f82f4a8637ae233969f202c36f6acd376aca21980313af7c9f50"
77
creationTimestamp: ~
88
labels:
99
apiserver: "true"
@@ -87,7 +87,7 @@ spec:
8787
httpGet:
8888
scheme: HTTPS
8989
port: 8443
90-
path: readyz
90+
path: readyz?exclude=etcd&exclude=etcd-readiness
9191
initialDelaySeconds: 0
9292
periodSeconds: 5
9393
timeoutSeconds: 10
@@ -213,4 +213,3 @@ spec:
213213
path: /var/log/oauth-apiserver
214214
name: audit-dir
215215
status: {}
216-

pkg/operator/workload/testdata/sync_ds_scenario_2.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Deployment
33
metadata:
44
annotations:
55
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
6-
operator.openshift.io/spec-hash: "fbe2e5bff6b8355967db0b9d904e66a2a56018f85b6e488362d6d5161bde1f93"
6+
operator.openshift.io/spec-hash: "857876e78675ca8630c8a1ef114cc9487d714ab30b0e22178ccc77ffd95012d5"
77
creationTimestamp: ~
88
labels:
99
apiserver: "true"
@@ -96,7 +96,7 @@ spec:
9696
httpGet:
9797
scheme: HTTPS
9898
port: 8443
99-
path: readyz
99+
path: readyz?exclude=etcd&exclude=etcd-readiness
100100
initialDelaySeconds: 0
101101
periodSeconds: 5
102102
timeoutSeconds: 10
@@ -222,4 +222,3 @@ spec:
222222
path: /var/log/oauth-apiserver
223223
name: audit-dir
224224
status: {}
225-

pkg/operator/workload/testdata/sync_ds_scenario_3.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Deployment
33
metadata:
44
annotations:
55
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
6-
operator.openshift.io/spec-hash: "ccb8d879eec9cdde0c99dd71a28ec2f55d94ffce29e96b74a2b126c3014f223d"
6+
operator.openshift.io/spec-hash: "a4574abdfafd21fb9a70db6c0cd6064f940ec4d3f199a0f5d9e0ac8392500f9d"
77
creationTimestamp: ~
88
labels:
99
apiserver: "true"
@@ -91,7 +91,7 @@ spec:
9191
httpGet:
9292
scheme: HTTPS
9393
port: 8443
94-
path: readyz
94+
path: readyz?exclude=etcd&exclude=etcd-readiness
9595
initialDelaySeconds: 0
9696
periodSeconds: 5
9797
timeoutSeconds: 10
@@ -217,4 +217,3 @@ spec:
217217
path: /var/log/oauth-apiserver
218218
name: audit-dir
219219
status: {}
220-

0 commit comments

Comments
 (0)