Skip to content

Commit b478171

Browse files
authored
Merge pull request #40280 from abrennan89/SRVKS-552
SRVKS-552: Add information about serverless configuration options
2 parents 32597f2 + 4137e62 commit b478171

File tree

7 files changed

+88
-40
lines changed

7 files changed

+88
-40
lines changed

_topic_maps/_topic_map.yml

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3163,31 +3163,16 @@ Topics:
31633163
File: serverless-autoscaling-scale-bounds
31643164
- Name: Concurrency
31653165
File: serverless-autoscaling-concurrency
3166-
# administer
3167-
- Name: Monitor
3168-
Dir: monitor
3169-
Topics:
3170-
# logging
3171-
- Name: Cluster logging with OpenShift Serverless
3172-
File: cluster-logging-serverless
3173-
# Tracing
3174-
- Name: Tracing requests using Jaeger
3175-
File: serverless-tracing
3176-
# Metrics
3177-
- Name: Metrics
3178-
File: serverless-serving-metrics
3179-
# monitoring services
3180-
- Name: Monitoring Knative services
3181-
File: serverless-service-monitoring
3182-
- Name: Autoscaling dashboard
3183-
File: serverless-autoscaling-dashboard
3184-
# Support
3185-
- Name: Support
3186-
File: serverless-support
3166+
- Name: Traffic management
3167+
File: serverless-traffic-management
3168+
- Name: Routing
3169+
File: serverless-configuring-routes
31873170
# Admin guide
3188-
- Name: Administration guide
3171+
- Name: Administer
31893172
Dir: admin_guide
31903173
Topics:
3174+
- Name: Configuring OpenShift Serverless
3175+
File: serverless-configuration
31913176
# Ingress options
31923177
- Name: Integrating Service Mesh with OpenShift Serverless
31933178
File: serverless-ossm-setup
@@ -3211,6 +3196,26 @@ Topics:
32113196
# HA
32123197
- Name: High availability on OpenShift Serverless
32133198
File: serverless-ha
3199+
- Name: Monitor
3200+
Dir: monitor
3201+
Topics:
3202+
# logging
3203+
- Name: Cluster logging with OpenShift Serverless
3204+
File: cluster-logging-serverless
3205+
# Tracing
3206+
- Name: Tracing requests using Jaeger
3207+
File: serverless-tracing
3208+
# Metrics
3209+
- Name: Metrics
3210+
File: serverless-serving-metrics
3211+
# monitoring services
3212+
- Name: Monitoring Knative services
3213+
File: serverless-service-monitoring
3214+
- Name: Autoscaling dashboard
3215+
File: serverless-autoscaling-dashboard
3216+
# Support
3217+
- Name: Support
3218+
File: serverless-support
32143219
# Security
32153220
- Name: Security
32163221
Dir: security
@@ -3221,16 +3226,6 @@ Topics:
32213226
File: serverless-custom-domains
32223227
- Name: Using a custom TLS certificate for domain mapping
32233228
File: serverless-custom-tls-cert-domain-mapping
3224-
# Knative Serving
3225-
- Name: Knative Serving
3226-
Dir: knative_serving
3227-
Topics:
3228-
# Knative services
3229-
- Name: Traffic management
3230-
File: serverless-traffic-management
3231-
# Routes
3232-
- Name: Configuring routes for Knative services
3233-
File: serverless-configuring-routes
32343229
# Knative Eventing
32353230
- Name: Knative Eventing
32363231
Dir: knative_eventing

modules/knative-serving-advanced-config.adoc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55
[id="knative-serving-advanced-config_{context}"]
66
= Knative Serving advanced configuration options
77

8-
[IMPORTANT]
9-
====
10-
Do not modify any YAML contained inside the `config` field. Some of the configuration values in this field are injected by the {ServerlessOperatorName}, and modifying them will cause your deployment to become unsupported.
11-
====
8+
This section provides information about advanced configuration options for Knative Serving.
129

1310
[id="knative-serving-controller-custom-certs_{context}"]
14-
== Controller Custom Certs
11+
== Controller custom certs
1512

1613
If your registry uses a self-signed certificate, you must enable tag-to-digest resolution by creating a config map or secret.
1714
To enable tag-to-digest resolution, the Knative Serving controller requires access to the container registry.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
include::modules/serverless-document-attributes.adoc[]
2+
[id="serverless-configuration"]
3+
= Configuring {ServerlessProductName}
4+
include::modules/common-attributes.adoc[]
5+
:context: serverless-configuration
6+
7+
toc::[]
8+
9+
The {ServerlessOperatorName} manages the global configuration of a Knative installation, including propagating values from the `KnativeServing` and `KnativeEventing` custom resources to system link:https://kubernetes.io/docs/concepts/configuration/configmap/[config maps].
10+
11+
Any updates to config maps which are applied manually are overwritten by the Operator. However, modifying the Knative custom resources allows you to set values for these config maps.
12+
13+
Knative has multiple config maps that are named with the prefix `config-`.
14+
15+
All Knative config maps are created in the same namespace as the custom resource that they apply to. For example, if the `KnativeServing` custom resource is created in the `knative-serving` namespace, all Knative Serving config maps are also created in this namespace.
16+
17+
The `spec.config` in the Knative custom resources have one `<name>` entry for each config map, named `config-<name>`, with a value which is be used for the config map `data`.
18+
19+
.Examples of global configuration
20+
21+
You can specify that the `KnativeServing` custom resource uses the `config-domain` config map as follows:
22+
23+
```yaml
24+
apiVersion: operator.knative.dev/v1alpha1
25+
kind: KnativeServing
26+
metadata:
27+
name: knative-serving
28+
namespace: knative-serving
29+
spec:
30+
config:
31+
domain: <1>
32+
example.org: |
33+
selector:
34+
app: prod
35+
example.com: ""
36+
```
37+
<1> Specifies the `config-domain` config map.
38+
39+
You can apply values to multiple config maps. This example sets `stable-window` to 60s in the `config-autoscaler` config map, as well as specifying the `config-domain` config map:
40+
41+
```yaml
42+
apiVersion: operator.knative.dev/v1alpha1
43+
kind: KnativeServing
44+
metadata:
45+
name: knative-serving
46+
namespace: knative-serving
47+
spec:
48+
config:
49+
domain: <1>
50+
example.org: |
51+
selector:
52+
app: prod
53+
example.com: ""
54+
autoscaler: <2>
55+
stable-window: "60s"
56+
```
57+
<1> Specifies the `config-domain` config map.
58+
<2> Specifies the `stable-window` setting in the `config-autoscaler` config map.

serverless/knative_serving/serverless-configuring-routes.adoc renamed to serverless/develop/serverless-configuring-routes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include::modules/serverless-document-attributes.adoc[]
22
[id="serverless-configuring-routes"]
3-
= Configuring routes for Knative services
3+
= Routing
44
:context: serverless-configuring-routes
55
include::modules/common-attributes.adoc[]
66

File renamed without changes.

serverless/knative_serving/images

Lines changed: 0 additions & 1 deletion
This file was deleted.

serverless/knative_serving/modules

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)