Skip to content

Commit 3849986

Browse files
authored
Merge pull request #39365 from abrennan89/install
SRVCOM-1580: Move install into own section
2 parents f18dd1a + dd644a1 commit 3849986

17 files changed

+25
-21
lines changed

_topic_maps/_topic_map.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3132,12 +3132,10 @@ Topics:
31323132
# Intro / getting started
31333133
- Name: Getting started
31343134
File: serverless-getting-started
3135-
#
3136-
# Admin guide
3137-
- Name: Administration guide
3138-
Dir: admin_guide
3135+
# Installing
3136+
- Name: Install
3137+
Dir: install
31393138
Topics:
3140-
#Installation
31413139
- Name: Installing the OpenShift Serverless Operator
31423140
File: install-serverless-operator
31433141
- Name: Installing Knative Serving
@@ -3148,6 +3146,10 @@ Topics:
31483146
File: upgrading-serverless
31493147
- Name: Removing OpenShift Serverless
31503148
File: removing-openshift-serverless
3149+
# Admin guide
3150+
- Name: Administration guide
3151+
Dir: admin_guide
3152+
Topics:
31513153
# Ingress options
31523154
- Name: Integrating Service Mesh with OpenShift Serverless
31533155
File: serverless-ossm-setup

applications/creating_applications/odc-creating-applications-using-developer-perspective.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The Managed services option is also available if the RHOAS Operator is installed
4141
** *Upload JAR file*: Upload a JAR file to build and deploy Java applications.
4242

4343
ifdef::openshift-enterprise,openshift-webscale[]
44-
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[{ServerlessOperatorName}], and xref:../../virt/install/installing-virt-web.adoc#virt-subscribing-to-the-catalog_installing-virt-web[OpenShift Virtualization Operator] are installed, respectively.
44+
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/install/install-serverless-operator.adoc#serverless-install-web-console_install-serverless-operator[{ServerlessOperatorName}], and xref:../../virt/install/installing-virt-web.adoc#virt-subscribing-to-the-catalog_installing-virt-web[OpenShift Virtualization Operator] are installed, respectively.
4545
endif::[]
4646

4747
[id="prerequisites_odc-creating-applications-using-developer-perspective"]
@@ -57,8 +57,8 @@ ifdef::openshift-enterprise,openshift-webscale[]
5757

5858
To create serverless applications, in addition to the preceding prerequisites, ensure that:
5959

60-
* You have xref:../../serverless/admin_guide/install-serverless-operator.adoc#install-serverless-operator[installed the {ServerlessOperatorName}].
61-
* You have xref:../../serverless/admin_guide/installing-knative-serving.adoc#installing-knative-serving[created a `KnativeServing` resource in the `knative-serving` namespace].
60+
* You have xref:../../serverless/install/install-serverless-operator.adoc#install-serverless-operator[installed the {ServerlessOperatorName}].
61+
* You have xref:../../serverless/install/installing-knative-serving.adoc#installing-knative-serving[created a `KnativeServing` resource in the `knative-serving` namespace].
6262

6363
endif::[]
6464

cli_reference/kn-cli-tools.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You can enable Knative on {product-title} by installing {ServerlessProductName}.
1212

1313
[NOTE]
1414
====
15-
{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}.
15+
{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/install/install-serverless-operator.adoc#install-serverless-operator[Serverless applications] documentation for {product-title}.
1616
====
1717

1818
[id="kn-cli-tools-key-features"]

modules/knative-serving-advanced-config.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * /serverless/admin_guide/installing-knative-serving.adoc
3+
// * /serverless/install/installing-knative-serving.adoc
44

55
[id="knative-serving-advanced-config_{context}"]
66
= Knative Serving advanced configuration options

modules/serverless-install-eventing-web-console.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * /serverless/admin_guide/installing-knative-eventing.adoc
3+
// * /serverless/install/installing-knative-eventing.adoc
44

55
[id="serverless-install-eventing-web-console_{context}"]
66
= Installing Knative Eventing using the web console

modules/serverless-install-serving-web-console.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * serverless/installing_serverless/installing-knative-serving.adoc
3+
// * serverless/install/installing-knative-serving.adoc
44

55
[id="serverless-install-serving-web-console_{context}"]
66
= Installing Knative Serving using the web console

modules/serverless-install-web-console.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * /serverless/admin_guide/install-serverless-operator.adoc
3+
// * /serverless/install/install-serverless-operator.adoc
44

55
[id="serverless-install-web-console_{context}"]
66
= Installing the {ServerlessOperatorName}

serverless/event_sources/serverless-apiserversource.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The API server source is an event source that can be used to connect an event si
1111
[id="prerequisites_serverless-apiserversource"]
1212
== Prerequisites
1313

14-
* 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.
14+
* You must have a current installation of xref:../../serverless/install/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.
1515
* 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.
1616
* You must create or update a service account, role and role binding for the event source.
1717

serverless/event_sources/serverless-kafka-source.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ You can create a Knative Kafka event source that reads events from an Apache Kaf
1111
[id="prerequisites_serverless-kafka-source"]
1212
== Prerequisites
1313

14-
You can use the `KafkaSource` event source with {ServerlessProductName} after you have xref:../../serverless/admin_guide/installing-knative-eventing.adoc#installing-knative-eventing[Knative Eventing] and xref:../../serverless/knative_eventing/serverless-kafka.adoc#serverless-kafka[Knative Kafka] installed on your cluster.
14+
You can use the `KafkaSource` event source with {ServerlessProductName} after you have xref:../../serverless/install/installing-knative-eventing.adoc#installing-knative-eventing[Knative Eventing] and xref:../../serverless/knative_eventing/serverless-kafka.adoc#serverless-kafka[Knative Kafka] installed on your cluster.
1515

1616
// dev console
1717
include::modules/serverless-kafka-source-odc.adoc[leveloffset=+1]

serverless/install/images

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../images

0 commit comments

Comments
 (0)