From 797be7519e301fb80e026dc95ca6e2b3da382ab9 Mon Sep 17 00:00:00 2001 From: Maxim Svistunov Date: Mon, 13 Jun 2022 20:38:03 +0200 Subject: [PATCH] Add Serverless docs for ROSA: functions and misc --- serverless/cli_tools/installing-kn.adoc | 2 +- serverless/discover/about-serverless.adoc | 2 +- .../serverless-functions-getting-started.adoc | 3 +-- .../functions/serverless-functions-setup.adoc | 14 +++++++------- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/serverless/cli_tools/installing-kn.adoc b/serverless/cli_tools/installing-kn.adoc index 85052b7a5c..f0c9c6e6fe 100644 --- a/serverless/cli_tools/installing-kn.adoc +++ b/serverless/cli_tools/installing-kn.adoc @@ -11,7 +11,7 @@ The Knative (`kn`) CLI does not have its own login mechanism. To log in to the c ifdef::openshift-enterprise[] For more information on installing the OpenShift (`oc`) CLI for your operating system and logging in with `oc`, see the xref:../../cli_reference/openshift_cli/getting-started-cli.adoc#cli-getting-started[OpenShift CLI getting started] documentation. endif::[] -// need to wait til CLI docs are added to OSD for this link to work +// need to wait til CLI docs are added to OSD and ROSA for this link to work // TODO: remove this conditional once this is available {ServerlessProductName} cannot be installed using the Knative (`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[Installing the {ServerlessOperatorName}] documentation. diff --git a/serverless/discover/about-serverless.adoc b/serverless/discover/about-serverless.adoc index a227215e85..1681546a57 100644 --- a/serverless/discover/about-serverless.adoc +++ b/serverless/discover/about-serverless.adoc @@ -44,5 +44,5 @@ ifdef::openshift-enterprise[] * xref:../../operators/understanding/crds/crd-extending-api-with-crds.adoc#crd-extending-api-with-crds[Extending the Kubernetes API with custom resource definitions] * xref:../../operators/understanding/crds/crd-managing-resources-from-crds.adoc#crd-managing-resources-from-crds[Managing resources from custom resource definitions] endif::[] -// above links only included for OCP currently until CRD docs are available in OSD +// above links only included for OCP currently until CRD docs are available in OSD and ROSA * link:https://www.redhat.com/en/topics/cloud-native-apps/what-is-serverless[What is serverless?] diff --git a/serverless/functions/serverless-functions-getting-started.adoc b/serverless/functions/serverless-functions-getting-started.adoc index d61f8d63fc..f365b4e6a0 100644 --- a/serverless/functions/serverless-functions-getting-started.adoc +++ b/serverless/functions/serverless-functions-getting-started.adoc @@ -27,9 +27,8 @@ ifdef::openshift-enterprise[] [role="_additional-resources"] == Additional resources * xref:../../registry/securing-exposing-registry.adoc#securing-exposing-registry[Exposing a default registry manually] +// This Additional resource applies only to OCP, but not to OSD nor ROSA. endif::[] -// need to wait til registry docs are added to OSD for this link to work -// TODO: remove these conditionals once this is available [id="next-steps_serverless-functions-getting-started"] == Next steps diff --git a/serverless/functions/serverless-functions-setup.adoc b/serverless/functions/serverless-functions-setup.adoc index 0ab674a9c5..6ff4b1d17f 100644 --- a/serverless/functions/serverless-functions-setup.adoc +++ b/serverless/functions/serverless-functions-setup.adoc @@ -26,9 +26,9 @@ Functions are deployed as a Knative service. If you want to use event-driven arc ifdef::openshift-enterprise[] * The xref:../../cli_reference/openshift_cli/getting-started-cli.adoc#cli-getting-started[`oc` CLI] is installed on your cluster. endif::[] -// need to wait til CLI docs are added to OSD for this link to work +// need to wait til CLI docs are added to OSD and ROSA for this link to work // TODO: remove these conditionals once this is available -ifdef::openshift-dedicated[] +ifdef::openshift-dedicated,openshift-rosa[] * The `oc` CLI is installed on your cluster. endif::[] @@ -39,18 +39,18 @@ endif::[] ifdef::openshift-enterprise[] * If you are using link:https://quay.io/[Quay.io] as the image registry, you must ensure that either the repository is not private, or that you have followed the {product-title} documentation on xref:../../openshift_images/managing_images/using-image-pull-secrets.adoc#images-allow-pods-to-reference-images-from-secure-registries_using-image-pull-secrets[Allowing pods to reference images from other secured registries]. endif::[] -// need to wait til images docs are added to OSD for this link to work +// need to wait til images docs are added to OSD and ROSA for this link to work // TODO: remove these conditionals once this is available -ifdef::openshift-dedicated[] +ifdef::openshift-dedicated,openshift-rosa[] * If you are using link:https://quay.io/[Quay.io] as the image registry, you must ensure that either the repository is not private, or that you have allowed pods on your cluster to reference images from other secured registries. endif::[] ifdef::openshift-enterprise[] * If you are using the OpenShift Container Registry, a cluster administrator must xref:../../registry/securing-exposing-registry.adoc#securing-exposing-registry[expose the registry]. endif::[] -// need to wait til registry docs are added to OSD for this link to work +// need to wait til registry docs are added to OSD and ROSA for this link to work // TODO: remove these conditionals once this is available -ifdef::openshift-dedicated[] +ifdef::openshift-dedicated,openshift-rosa[] * If you are using the OpenShift Container Registry, a cluster or dedicated administrator must expose the registry. endif::[] @@ -62,7 +62,7 @@ include::modules/serverless-functions-podman.adoc[leveloffset=+1] ifdef::openshift-enterprise[] * For more information about Docker Container Engine or podman, see xref:../../architecture/understanding-development.adoc#container-build-tool-options[Container build tool options]. endif::[] -// need to wait til build tool docs are added to OSD for this link to work +// need to wait til build tool docs are added to OSD and ROSA for this link to work // TODO: remove these conditionals once this is available * See xref:../../serverless/functions/serverless-functions-getting-started.adoc#serverless-functions-getting-started[Getting started with functions].