Skip to content

Commit ca530dd

Browse files
authored
Merge pull request #53270 from rh-max/srvls-knative-probe-config
[SRVCOM-2062] Add probe configuration info for Knative deployments
2 parents e60b6e9 + 381c6c8 commit ca530dd

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

modules/knative-eventing-CR-system-deployments.adoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="knative-eventing-CR-system-deployments_{context}"]
77
= Overriding Knative Eventing system deployment configurations
88

9-
You can override the default configurations for some specific deployments by modifying the `deployments` spec in the `KnativeEventing` custom resource (CR). Currently, overriding default configuration settings is supported for the `eventing-controller`, `eventing-webhook`, and `imc-controller` fields.
9+
You can override the default configurations for some specific deployments by modifying the `deployments` spec in the `KnativeEventing` custom resource (CR). Currently, overriding default configuration settings is supported for the `eventing-controller`, `eventing-webhook`, and `imc-controller` fields, as well as for the `readiness` and `liveness` fields for probes.
1010

1111
[IMPORTANT]
1212
====
@@ -15,6 +15,7 @@ The `replicas` spec cannot override the number of replicas for deployments that
1515

1616
In the following example, a `KnativeEventing` CR overrides the `eventing-controller` deployment so that:
1717

18+
* The `readiness` probe timeout `eventing-controller` is set to be 10 seconds.
1819
* The deployment has specified CPU and memory resource limits.
1920
* The deployment has 3 replicas.
2021
* The `example-label: label` label is added.
@@ -32,6 +33,9 @@ metadata:
3233
spec:
3334
deployments:
3435
- name: eventing-controller
36+
readinessProbes: <1>
37+
- container: controller
38+
timeoutSeconds: 10
3539
resources:
3640
- container: eventing-controller
3741
requests:
@@ -48,6 +52,7 @@ spec:
4852
nodeSelector:
4953
disktype: hdd
5054
----
55+
<1> You can use the `readiness` and `liveness` probe overrides to override all fields of a probe in a container of a deployment as specified in the Kubernetes API except for the fields related to the probe handler: `exec`, `grpc`, `httpGet`, and `tcpSocket`.
5156

5257
[NOTE]
5358
====

modules/knative-serving-CR-system-deployments.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
[id="knative-serving-CR-system-deployments_{context}"]
77
= Overriding Knative Serving system deployment configurations
88

9-
You can override the default configurations for some specific deployments by modifying the `deployments` spec in the `KnativeServing` custom resource (CR). Currently, overriding default configuration settings is supported for the `resources`, `replicas`, `labels`, `annotations`, and `nodeSelector` fields.
9+
You can override the default configurations for some specific deployments by modifying the `deployments` spec in the `KnativeServing` custom resource (CR). Currently, overriding default configuration settings is supported for the `resources`, `replicas`, `labels`, `annotations`, and `nodeSelector` fields, as well as for the `readiness` and `liveness` fields for probes.
1010

1111
In the following example, a `KnativeServing` CR overrides the `webhook` deployment so that:
1212

13+
* The `readiness` probe timeout for `net-kourier-controller` is set to be 10 seconds.
1314
* The deployment has specified CPU and memory resource limits.
1415
* The deployment has 3 replicas.
1516
* The `example-label: label` label is added.
@@ -33,6 +34,10 @@ spec:
3334
high-availability:
3435
replicas: 2
3536
deployments:
37+
- name: net-kourier-controller
38+
readinessProbes: <1>
39+
- container: controller
40+
timeoutSeconds: 10
3641
- name: webhook
3742
resources:
3843
- container: webhook
@@ -50,3 +55,4 @@ spec:
5055
nodeSelector:
5156
disktype: hdd
5257
----
58+
<1> You can use the `readiness` and `liveness` probe overrides to override all fields of a probe in a container of a deployment as specified in the Kubernetes API except for the fields related to the probe handler: `exec`, `grpc`, `httpGet`, and `tcpSocket`.

serverless/admin_guide/serverless-configuration.adoc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,17 @@ include::modules/serverless-scale-to-zero-grace-period.adoc[leveloffset=+1]
3434
You can override the default configurations for some specific deployments by modifying the `deployments` spec in the `KnativeServing` and `KnativeEventing` custom resources (CRs).
3535

3636
include::modules/knative-serving-CR-system-deployments.adoc[leveloffset=+2]
37+
38+
[role="_additional-resources"]
39+
.Additional resources
40+
* link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#probe-v1-core[Probe configuration section of the Kubernetes API documentation]
41+
3742
include::modules/knative-eventing-CR-system-deployments.adoc[leveloffset=+2]
3843

44+
[role="_additional-resources"]
45+
.Additional resources
46+
* link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#probe-v1-core[Probe configuration section of the Kubernetes API documentation]
47+
3948
// enable emptydirs
4049
include::modules/serverless-config-emptydir.adoc[leveloffset=+1]
4150
// global https redirect

0 commit comments

Comments
 (0)