From e9717a510fe5875490578e8682bdcd76cac8a015 Mon Sep 17 00:00:00 2001 From: Ashleigh Brennan Date: Thu, 27 May 2021 11:37:20 -0500 Subject: [PATCH] Updating istall docs structure --- _topic_map.yml | 6 ++---- ...lications-using-developer-perspective.adoc | 6 ++++-- cli_reference/kn-cli-tools.adoc | 2 +- modules/knative-serving-advanced-config.adoc | 2 +- modules/serverless-cluster-sizing-req.adoc | 15 ++++++++------ modules/serverless-install-web-console.adoc | 7 ++++++- modules/serverless-ossm-setup.adoc | 5 ----- ...service-mesh-enable-sidecar-injection.adoc | 14 ++++++++----- ...verless-uninstalling-knative-eventing.adoc | 4 +--- ...rverless-uninstalling-knative-serving.adoc | 4 +--- ....adoc => install-serverless-operator.adoc} | 11 +++------- .../installing-knative-eventing.adoc | 3 --- .../installing-knative-serving.adoc | 7 ++++--- .../serverless-install-config-options.adoc | 20 ------------------- .../admin_guide/upgrading-serverless.adoc | 2 +- .../serverless-apiserversource.adoc | 2 +- .../serverless-ossm-custom-domains.adoc | 2 +- .../networking/serverless-ossm-jwt.adoc | 2 +- .../networking/serverless-ossm-tls.adoc | 2 +- serverless/networking/serverless-ossm.adoc | 7 +------ serverless/serverless-getting-started.adoc | 2 +- 21 files changed, 48 insertions(+), 77 deletions(-) rename serverless/admin_guide/{installing-openshift-serverless.adoc => install-serverless-operator.adoc} (84%) delete mode 100644 serverless/admin_guide/serverless-install-config-options.adoc diff --git a/_topic_map.yml b/_topic_map.yml index f25f2d06c2..99f9c43fe8 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -2896,14 +2896,12 @@ Topics: Dir: admin_guide Topics: #Installation - - Name: Installing OpenShift Serverless - File: installing-openshift-serverless + - Name: Installing the OpenShift Serverless Operator + File: install-serverless-operator - Name: Installing Knative Serving File: installing-knative-serving - Name: Installing Knative Eventing File: installing-knative-eventing - - Name: Advanced installation configuration options - File: serverless-install-config-options - Name: Upgrading the OpenShift Serverless Operator File: upgrading-serverless - Name: Removing OpenShift Serverless diff --git a/applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc b/applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc index b13764ff12..95c9995193 100644 --- a/applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc +++ b/applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc @@ -17,10 +17,12 @@ The *Developer* perspective in the web console provides you the following option * *Helm Chart*: Explore the *Developer Catalog* to select the required Helm chart to simplify deployment of applications and services. ifdef::openshift-enterprise,openshift-webscale[] -Note that certain options, such as *Pipelines*, *Event Source*, and *Import Virtual Machines*, are displayed only when the xref:../../cicd/pipelines/installing-pipelines.adoc#op-installing-pipelines-operator-in-web-console_installing-pipelines[OpenShift Pipelines], xref:../../serverless/admin_guide/installing-openshift-serverless.adoc#serverless-install-web-console_installing-openshift-serverless[OpenShift Serverless], and xref:../../virt/install/installing-virt-web.adoc#virt-subscribing-to-the-catalog_installing-virt-web[OpenShift Virtualization] Operators are installed, respectively. +Note that certain options, such as *Pipelines*, *Event Source*, and *Import Virtual Machines*, are displayed only when the xref:../../cicd/pipelines/installing-pipelines.adoc#op-installing-pipelines-operator-in-web-console_installing-pipelines[OpenShift Pipelines Operator], xref:../../serverless/admin_guide/install-serverless-operator.adoc#serverless-install-web-console_install-serverless-operator[OpenShift Serverless Operator], and xref:../../virt/install/installing-virt-web.adoc#virt-subscribing-to-the-catalog_installing-virt-web[OpenShift Virtualization Operator] are installed, respectively. endif::[] +[id="prerequisites_odc-creating-applications-using-developer-perspective"] == Prerequisites + To create applications using the *Developer* perspective ensure that: * You have xref:../../web_console/web-console.adoc#web-console[logged in to the web console]. @@ -31,7 +33,7 @@ ifdef::openshift-enterprise,openshift-webscale[] To create serverless applications, in addition to the preceding prerequisites, ensure that: -* You have xref:../../serverless/admin_guide/installing-openshift-serverless.adoc#installing-openshift-serverless[installed the OpenShift Serverless Operator]. +* You have xref:../../serverless/admin_guide/install-serverless-operator.adoc#install-serverless-operator[installed the OpenShift Serverless Operator]. * You have xref:../../serverless/admin_guide/installing-knative-serving.adoc#installing-knative-serving[created a `KnativeServing` resource in the `knative-serving` namespace]. endif::[] diff --git a/cli_reference/kn-cli-tools.adoc b/cli_reference/kn-cli-tools.adoc index ef15e24e1b..ae2a11cefb 100644 --- a/cli_reference/kn-cli-tools.adoc +++ b/cli_reference/kn-cli-tools.adoc @@ -12,7 +12,7 @@ You can enable Knative on {product-title} by installing {ServerlessProductName}. [NOTE] ==== -{ServerlessProductName} cannot be installed using the `kn` CLI. A cluster administrator must install the {ServerlessOperatorName} and set up the Knative components, as described in the xref:../serverless/admin_guide/installing-openshift-serverless.adoc#installing-openshift-serverless[Serverless applications] documentation for {product-title}. +{ServerlessProductName} cannot be installed using the `kn` CLI. A cluster administrator must install the {ServerlessOperatorName} and set up the Knative components, as described in the xref:../serverless/admin_guide/install-serverless-operator.adoc#install-serverless-operator[Serverless applications] documentation for {product-title}. ==== [id="kn-cli-tools-key-features"] diff --git a/modules/knative-serving-advanced-config.adoc b/modules/knative-serving-advanced-config.adoc index af217aebbf..95051ea39b 100644 --- a/modules/knative-serving-advanced-config.adoc +++ b/modules/knative-serving-advanced-config.adoc @@ -4,7 +4,7 @@ // * /serverless/installing_serverless/serverless-install-config-options.adoc [id="knative-serving-advanced-config_{context}"] -= Knative Serving supported installation configuration options += Knative Serving advanced configuration options [IMPORTANT] ==== diff --git a/modules/serverless-cluster-sizing-req.adoc b/modules/serverless-cluster-sizing-req.adoc index 2fef4bc8e7..d02c4ae63f 100644 --- a/modules/serverless-cluster-sizing-req.adoc +++ b/modules/serverless-cluster-sizing-req.adoc @@ -1,20 +1,23 @@ -// Module is included in the following assemblies: +// Module included in the following assemblies: // -// serverless/installing_serverless/installing-openshift-serverless.adoc +// * /serverless/admin_guide/install-serverless-operator.adoc [id="serverless-cluster-sizing-req_{context}"] = Defining cluster size requirements for an {ServerlessProductName} installation To install and use {ServerlessProductName}, the {product-title} cluster must be sized correctly. -The minimum requirement for {ServerlessProductName} is a cluster with 10 CPUs and 40GB memory. -The total size requirements to run {ServerlessProductName} are dependent on the applications deployed. By default, each pod requests approximately 400m of CPU, so the minimum requirements are based on this value. -In the size requirement provided, an application can scale up to 10 replicas. Lowering the actual CPU request of applications can increase the number of possible replicas. [NOTE] ==== -The requirements provided relate only to the pool of worker machines of the {product-title} cluster. Master nodes are not used for general scheduling and are omitted from the requirements. +The following requirements relate only to the pool of worker machines of the {product-title} cluster. Control plane nodes are not used for general scheduling and are omitted from the requirements. ==== +The minimum requirement for {ServerlessProductName} is a cluster with 10 CPUs and 40GB memory. + +The total size requirements to run {ServerlessProductName} are dependent on the applications deployed. By default, each pod requests approximately 400m of CPU, so the minimum requirements are based on this value. + +In the size requirement provided, an application can scale up to 10 replicas. Lowering the actual CPU request of applications can increase the number of possible replicas. + [NOTE] ==== The following limitations apply to all {ServerlessProductName} deployments: diff --git a/modules/serverless-install-web-console.adoc b/modules/serverless-install-web-console.adoc index a5de9745ba..f4cd1aedad 100644 --- a/modules/serverless-install-web-console.adoc +++ b/modules/serverless-install-web-console.adoc @@ -1,12 +1,17 @@ // Module included in the following assemblies: // -// * /serverless/installing_serverless/installing-openshift-serverless.adoc +// * /serverless/admin_guide/install-serverless-operator.adoc [id="serverless-install-web-console_{context}"] = Installing the {ServerlessOperatorName} This procedure describes how to install and subscribe to the {ServerlessOperatorName} from the OperatorHub using the {product-title} web console. +[IMPORTANT] +==== +Before upgrading to the latest Serverless release, you must remove the community Knative Eventing Operator if you have previously installed it. Having the Knative Eventing Operator installed prevents you from being able to install the latest version of Knative Eventing using the {ServerlessOperatorName}. +==== + .Procedure . In the {product-title} web console, navigate to the *Operators* -> *OperatorHub* page. diff --git a/modules/serverless-ossm-setup.adoc b/modules/serverless-ossm-setup.adoc index 89b4fbaef2..44d960f33c 100644 --- a/modules/serverless-ossm-setup.adoc +++ b/modules/serverless-ossm-setup.adoc @@ -21,11 +21,6 @@ spec: - <1> ---- <1> A list of namespaces to be integrated with {ProductShortName}. -+ -[IMPORTANT] -==== -Adding sidecar injection to pods in system namespaces such as `knative-serving` and `knative-serving-ingress` is not supported. -==== . Create a network policy that permits traffic flow from Knative system Pods to Knative services: .. Add the `serving.knative.openshift.io/system-namespace=true` label to the `knative-serving` namespace: + diff --git a/modules/serverless-service-mesh-enable-sidecar-injection.adoc b/modules/serverless-service-mesh-enable-sidecar-injection.adoc index 88b60fc9d3..fe29d22297 100644 --- a/modules/serverless-service-mesh-enable-sidecar-injection.adoc +++ b/modules/serverless-service-mesh-enable-sidecar-injection.adoc @@ -5,13 +5,18 @@ [id="serverless-enable-sidecar_{context}"] = Enabling sidecar injection for a Knative service -You can add an annotation to the Service resource YAML file to enable sidecar injection for a Knative service. +You can add the `sidecar.istio.io/inject="true"` annotation to a Knative service to enable sidecar injection for that service. + +[IMPORTANT] +==== +Adding sidecar injection to pods in system namespaces such as `knative-serving` and `knative-serving-ingress` is not supported. +==== .Procedure -. Add the `sidecar.istio.io/inject="true"` annotation to the Service resource: +. Add the `sidecar.istio.io/inject="true"` annotation to the `Service` resource YAML file: + - +.Example service YAML [source,yaml] ---- apiVersion: serving.knative.dev/v1 @@ -30,9 +35,8 @@ spec: ---- <1> Add the `sidecar.istio.io/inject="true"` annotation. -. Apply the Service resource YAML file: +. Apply the `Service` resource YAML file: + - [source,terminal] ---- $ oc apply -f diff --git a/modules/serverless-uninstalling-knative-eventing.adoc b/modules/serverless-uninstalling-knative-eventing.adoc index c077aea0c8..e3b6740838 100644 --- a/modules/serverless-uninstalling-knative-eventing.adoc +++ b/modules/serverless-uninstalling-knative-eventing.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// serverless/installing_serverless/installing-openshift-serverless.adoc +// * serverless/admin_guide/removing-openshift-serverless.adoc [id="serverless-uninstalling-knative-eventing_{context}"] = Uninstalling Knative Eventing @@ -11,7 +11,6 @@ To uninstall Knative Eventing, you must remove its custom resource and delete th . Delete the `knative-eventing` custom resource: + - [source,terminal] ---- $ oc delete knativeeventings.operator.knative.dev knative-eventing -n knative-eventing @@ -19,7 +18,6 @@ $ oc delete knativeeventings.operator.knative.dev knative-eventing -n knative-ev . After the command has completed and all pods have been removed from the `knative-eventing` namespace, delete the namespace: + - [source,terminal] ---- $ oc delete namespace knative-eventing diff --git a/modules/serverless-uninstalling-knative-serving.adoc b/modules/serverless-uninstalling-knative-serving.adoc index aa792ea94c..13a80c2292 100644 --- a/modules/serverless-uninstalling-knative-serving.adoc +++ b/modules/serverless-uninstalling-knative-serving.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// serverless/installing_serverless/installing-openshift-serverless.adoc +// * serverless/admin_guide/removing-openshift-serverless.adoc [id="serverless-uninstalling-knative-serving_{context}"] = Uninstalling Knative Serving @@ -11,7 +11,6 @@ To uninstall Knative Serving, you must remove its custom resource and delete the . Delete the `knative-serving` custom resource: + - [source,terminal] ---- $ oc delete knativeservings.operator.knative.dev knative-serving -n knative-serving @@ -19,7 +18,6 @@ $ oc delete knativeservings.operator.knative.dev knative-serving -n knative-serv . After the command has completed and all pods have been removed from the `knative-serving` namespace, delete the namespace: + - [source,terminal] ---- $ oc delete namespace knative-serving diff --git a/serverless/admin_guide/installing-openshift-serverless.adoc b/serverless/admin_guide/install-serverless-operator.adoc similarity index 84% rename from serverless/admin_guide/installing-openshift-serverless.adoc rename to serverless/admin_guide/install-serverless-operator.adoc index 6ff7b238c3..38f315fcbb 100644 --- a/serverless/admin_guide/installing-openshift-serverless.adoc +++ b/serverless/admin_guide/install-serverless-operator.adoc @@ -1,8 +1,8 @@ include::modules/serverless-document-attributes.adoc[] -[id="installing-openshift-serverless"] -= Installing {ServerlessProductName} +[id="install-serverless-operator"] += Installing the {ServerlessOperatorName} include::modules/common-attributes.adoc[] -:context: installing-openshift-serverless +:context: install-serverless-operator toc::[] @@ -13,11 +13,6 @@ This guide walks cluster administrators through installing the {ServerlessOperat {ServerlessProductName} is supported for installation in a restricted network environment. For more information, see xref:../../operators/admin/olm-restricted-networks.adoc#olm-restricted-networks[Using Operator Lifecycle Manager on restricted networks]. ==== -[IMPORTANT] -==== -Before upgrading to the latest Serverless release, you must remove the community Knative Eventing Operator if you have previously installed it. Having the Knative Eventing Operator installed will prevent you from being able to install the latest version of Knative Eventing using the {ServerlessOperatorName}. -==== - include::modules/serverless-cluster-sizing-req.adoc[leveloffset=+1] [id="installing-openshift-serverless-advanced-reqs"] diff --git a/serverless/admin_guide/installing-knative-eventing.adoc b/serverless/admin_guide/installing-knative-eventing.adoc index 817701b2a1..8f53879235 100644 --- a/serverless/admin_guide/installing-knative-eventing.adoc +++ b/serverless/admin_guide/installing-knative-eventing.adoc @@ -9,9 +9,6 @@ toc::[] After you install the {ServerlessOperatorName}, you can install Knative Eventing by following the procedures described in this guide. This guide provides information about installing Knative Eventing using the default settings. -// However, you can configure more advanced settings in the KnativeEventing custom resource definition. - -// For more information about configuration options for the KnativeEventing custom resource definition, see xref:../../serverless/admin_guide/serverless-install-config-options.adoc#serverless-install-config-options[Advanced installation configuration options]. [id="prerequisites_installing-knative-eventing"] == Prerequisites diff --git a/serverless/admin_guide/installing-knative-serving.adoc b/serverless/admin_guide/installing-knative-serving.adoc index 07e45c60ae..34567ec130 100644 --- a/serverless/admin_guide/installing-knative-serving.adoc +++ b/serverless/admin_guide/installing-knative-serving.adoc @@ -6,9 +6,9 @@ include::modules/common-attributes.adoc[] toc::[] -After you install the {ServerlessOperatorName}, you can install Knative Serving. -This guide provides information about installing Knative Serving using the default settings. However, you can configure more advanced settings in the `KnativeServing` custom resource definition (CRD). -For more information about configuration options for the `KnativeServing` CRD, see xref:../../serverless/admin_guide/serverless-install-config-options.adoc#serverless-install-config-options[Advanced installation configuration options]. +After you have xref:../../serverless/admin_guide/install-serverless-operator.adoc#install-serverless-operator[installed the {ServerlessOperatorName}], you can install Knative Serving. + +This guide provides information about installing Knative Serving using the default settings. However, you can configure more advanced settings in the `KnativeServing` custom resource definition (CRD). For more information about configuration options for the `KnativeServing` CRD, see xref:../../serverless/admin_guide/installing-knative-serving.adoc#knative-serving-advanced-config_installing-knative-serving[Knative Serving advanced configuration options]. [id="prerequisites_installing-knative-serving"] == Prerequisites @@ -18,6 +18,7 @@ For more information about configuration options for the `KnativeServing` CRD, s include::modules/serverless-install-serving-web-console.adoc[leveloffset=+1] include::modules/serverless-install-serving-yaml.adoc[leveloffset=+1] +include::modules/knative-serving-advanced-config.adoc[leveloffset=+1] [id="next-steps_installing-knative-serving"] == Next steps diff --git a/serverless/admin_guide/serverless-install-config-options.adoc b/serverless/admin_guide/serverless-install-config-options.adoc deleted file mode 100644 index a03852aabd..0000000000 --- a/serverless/admin_guide/serverless-install-config-options.adoc +++ /dev/null @@ -1,20 +0,0 @@ -include::modules/serverless-document-attributes.adoc[] -[id="serverless-install-config-options"] -= Advanced installation configuration options -include::modules/common-attributes.adoc[] -:context: serverless-install-config-options - -toc::[] - -This guide provides information for cluster administrators about advanced installation configuration options for {ServerlessProductName} components. - -include::modules/knative-serving-advanced-config.adoc[leveloffset=+1] - -// == Knative Eventing supported installation configuration options -// image::eventing-form-view.png[Create Knative Eventing form] -// TODO: Add when there's more information for eventing. - -[id="additional-resources_serverless-install-config-options"] -== Additional resources - -* For more information about configuring high availability, see xref:../../serverless/serverless-HA.adoc#serverless-HA[High availability on {ServerlessProductName}]. diff --git a/serverless/admin_guide/upgrading-serverless.adoc b/serverless/admin_guide/upgrading-serverless.adoc index 3ba89f068a..f6cd57593f 100644 --- a/serverless/admin_guide/upgrading-serverless.adoc +++ b/serverless/admin_guide/upgrading-serverless.adoc @@ -10,7 +10,7 @@ If you have installed a previous version of {ServerlessProductName}, follow the [IMPORTANT] ==== -Before upgrading to the latest Serverless release, you must remove the community Knative Eventing Operator if you have previously installed it. Having the Knative Eventing Operator installed will prevent you from being able to install the latest version of Knative Eventing. +Before upgrading to the latest Serverless release, you must remove the community Knative Eventing Operator if you have previously installed it. Having the Knative Eventing Operator installed prevents you from being able to install the latest version of Knative Eventing using the {ServerlessOperatorName}. ==== include::modules/serverless-upgrade-sub-channel.adoc[leveloffset=+1] diff --git a/serverless/event_sources/serverless-apiserversource.adoc b/serverless/event_sources/serverless-apiserversource.adoc index a624f4985d..c6191a722e 100644 --- a/serverless/event_sources/serverless-apiserversource.adoc +++ b/serverless/event_sources/serverless-apiserversource.adoc @@ -11,7 +11,7 @@ The API server source is an event source that can be used to connect an event si [id="prerequisites_serverless-apiserversource"] == Prerequisites -* You must have a current installation of xref:../../serverless/admin_guide/installing-openshift-serverless.adoc#serverless-install-web-console_installing-openshift-serverless[{ServerlessProductName}], including Knative Serving and Eventing, in your {product-title} cluster. This can be installed by a cluster administrator. +* You must have a current installation of xref:../../serverless/admin_guide/install-serverless-operator.adoc#serverless-install-web-console_install-serverless-operator[{ServerlessProductName}], including Knative Serving and Eventing, in your {product-title} cluster. This can be installed by a cluster administrator. * Event sources need a service to use as an event _sink_. The sink is the service or application that events are sent to from the event source. * You must create or update a service account, role and role binding for the event source. diff --git a/serverless/networking/serverless-ossm-custom-domains.adoc b/serverless/networking/serverless-ossm-custom-domains.adoc index b80386f8a5..61fe9a6afb 100644 --- a/serverless/networking/serverless-ossm-custom-domains.adoc +++ b/serverless/networking/serverless-ossm-custom-domains.adoc @@ -24,7 +24,7 @@ You can customize the domain for your Knative service by configuring the service [id="prerequisites_serverless-ossm-custom-domains"] == Prerequisites -* Install the xref:../../serverless/admin_guide/installing-openshift-serverless.adoc#installing-openshift-serverless[{ServerlessOperatorName}] and xref:../../serverless/admin_guide/installing-knative-serving.adoc#installing-knative-serving[Knative Serving]. +* Install the xref:../../serverless/admin_guide/install-serverless-operator.adoc#install-serverless-operator[{ServerlessOperatorName}] and xref:../../serverless/admin_guide/installing-knative-serving.adoc#installing-knative-serving[Knative Serving]. * Install xref:../../service_mesh/v1x/preparing-ossm-installation.adoc#preparing-ossm-installation-v1x[{ProductName}]. * Complete the configuration steps in xref:../../serverless/networking/serverless-ossm.adoc#serverless-ossm[Using {ProductShortName} with {ServerlessProductName}]. * You can configure a custom domain for an existing Knative service, or create a new sample service. To create a new service, see xref:../../serverless/knative_serving/serverless-applications.adoc#serverless-applications[Creating and managing serverless applications]. diff --git a/serverless/networking/serverless-ossm-jwt.adoc b/serverless/networking/serverless-ossm-jwt.adoc index 41cc749e3d..8b8ce79e2a 100644 --- a/serverless/networking/serverless-ossm-jwt.adoc +++ b/serverless/networking/serverless-ossm-jwt.adoc @@ -17,7 +17,7 @@ You can enable JSON Web Token (JWT) authentication for Knative services. [id="prerequisites_serverless-ossm-jwt"] == Prerequisites -* Install xref:../../serverless/admin_guide/installing-openshift-serverless.adoc#installing-openshift-serverless[{ServerlessProductName}]. +* Install xref:../../serverless/admin_guide/install-serverless-operator.adoc#install-serverless-operator[{ServerlessProductName}]. * Install {ProductName}. {ServerlessProductName} is supported for use with both {ProductName} version xref:../../service_mesh/v1x/installing-ossm.adoc#installing-ossm[1.x] and version xref:../../service_mesh/v2x/installing-ossm.adoc#installing-ossm[2.x]. * Configure xref:../../serverless/networking/serverless-ossm.adoc#serverless-ossm[{ProductShortName} with {ServerlessProductName}], including enabling sidecar injection for your Knative services. diff --git a/serverless/networking/serverless-ossm-tls.adoc b/serverless/networking/serverless-ossm-tls.adoc index 45a1d6553f..a8d477637a 100644 --- a/serverless/networking/serverless-ossm-tls.adoc +++ b/serverless/networking/serverless-ossm-tls.adoc @@ -22,7 +22,7 @@ You can create a Transport Layer Security (TLS) key and certificates for a custo [id="prerequisites_serverless-ossm-tls"] == Prerequisites -* Install xref:../../serverless/admin_guide/installing-openshift-serverless.adoc#installing-openshift-serverless[{ServerlessProductName}]. +* Install xref:../../serverless/admin_guide/install-serverless-operator.adoc#install-serverless-operator[{ServerlessProductName}]. * Install {ProductName} xref:../../service_mesh/v1x/installing-ossm.adoc#installing-ossm-v1x[1.x] or xref:../../service_mesh/v2x/installing-ossm.adoc#installing-ossm-v2x[2.x]. * Complete the configuration steps in xref:../../serverless/networking/serverless-ossm.adoc#serverless-ossm[Using Service Mesh with OpenShift Serverless]. * Configure a custom domain. See xref:../../serverless/networking/serverless-ossm-custom-domains.adoc#serverless-ossm-custom-domains[Using custom domains for Knative services with Service Mesh]. diff --git a/serverless/networking/serverless-ossm.adoc b/serverless/networking/serverless-ossm.adoc index f61ed6f119..c16f429d4f 100644 --- a/serverless/networking/serverless-ossm.adoc +++ b/serverless/networking/serverless-ossm.adoc @@ -15,15 +15,10 @@ toc::[] Using {ProductShortName} with {ServerlessProductName} enables developers to configure additional networking and routing options that are not supported when using {ServerlessProductName} with the default Kourier implementation. These options include setting custom domains, using TLS certificates, and using JSON Web Token authentication. -[IMPORTANT] -==== -Adding sidecar injection to pods in system namespaces such as `knative-serving` and `knative-serving-ingress` is not supported. -==== - [id="prerequisites_serverless-ossm"] == Prerequisites -* Install the xref:../../serverless/admin_guide/installing-openshift-serverless.adoc#installing-openshift-serverless[{ServerlessOperatorName}] and xref:../../serverless/admin_guide/installing-knative-serving.adoc#installing-knative-serving[Knative Serving]. +* Install the xref:../../serverless/admin_guide/install-serverless-operator.adoc#install-serverless-operator[{ServerlessOperatorName}] and xref:../../serverless/admin_guide/installing-knative-serving.adoc#installing-knative-serving[Knative Serving]. * Install {ProductName}. {ServerlessProductName} is supported for use with both {ProductName} version xref:../../service_mesh/v1x/installing-ossm.adoc#installing-ossm[1.x] and version xref:../../service_mesh/v2x/installing-ossm.adoc#installing-ossm[2.x]. include::modules/serverless-ossm-setup.adoc[leveloffset=+1] diff --git a/serverless/serverless-getting-started.adoc b/serverless/serverless-getting-started.adoc index 88ae6d1231..b6667783bd 100644 --- a/serverless/serverless-getting-started.adoc +++ b/serverless/serverless-getting-started.adoc @@ -25,5 +25,5 @@ The set of supported features, configurations, and integrations for {ServerlessP [id="next-steps_serverless-getting-started"] == Next steps -* Install the xref:../serverless/admin_guide/installing-openshift-serverless.adoc#installing-openshift-serverless[{ServerlessOperatorName}] on your {product-title} cluster to get started. +* Install the xref:../serverless/admin_guide/install-serverless-operator.adoc#install-serverless-operator[{ServerlessOperatorName}] on your {product-title} cluster to get started. * View the xref:../serverless/serverless-release-notes.adoc#serverless-release-notes[{ServerlessProductName} release notes].