Skip to content

Commit f4e2980

Browse files
authored
Merge pull request #32673 from abrennan89/integratedreg
[srvls][SRVOCF-278] Add OpenShift registry docs
2 parents a36c98b + 59c4cba commit f4e2980

File tree

5 files changed

+32
-6
lines changed

5 files changed

+32
-6
lines changed

_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2963,10 +2963,10 @@ Topics:
29632963
# Topics:
29642964
# - Name: About OpenShift Serverless Functions
29652965
# File: serverless-functions-about
2966-
# - Name: Getting started
2967-
# File: serverless-functions-getting-started
29682966
# - Name: Setting up OpenShift Serverless Functions
29692967
# File: serverless-functions-setup
2968+
# - Name: Getting started with functions
2969+
# File: serverless-functions-getting-started
29702970
# - Name: Developing Node.js functions
29712971
# File: serverless-developing-nodejs-functions
29722972
# - Name: Developing Golang functions
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * serverless/serverless-functions-setup.adoc
4+
5+
[id="serverless-functions-using-integrated-registry_{context}"]
6+
= Building and deploying functions with OpenShift Container Registry
7+
8+
When building and deploying functions, the resulting container image is stored in an image registry. Usually this will be a public registry, such as Quay. However, you can use the integrated OpenShift Container Registry instead if it has been exposed by a cluster administrator.
9+
10+
.Procedure
11+
12+
* Run the `kn func build` command, or the `kn func deploy` command, with the OpenShift Container Registry specified for the `-r` parameter:
13+
+
14+
.Example build command
15+
[source,terminal]
16+
----
17+
$ kn func build -r $(oc get route -n openshift-image-registry)
18+
----
19+
+
20+
.Example deploy command
21+
[source,terminal]
22+
----
23+
$ kn func deploy -r $(oc get route -n openshift-image-registry)
24+
----

serverless/functions/serverless-functions-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ The `kn func` CLI is provided as a plug-in for the Knative `kn` CLI. {FunctionsP
2828
[id="next-steps_serverless-functions-about"]
2929
== Next steps
3030

31-
* See xref:../../serverless/functions/serverless-functions-getting-started.adoc#serverless-functions-getting-started[Getting started].
31+
* See xref:../../serverless/functions/serverless-functions-getting-started.adoc#serverless-functions-getting-started[Getting started with functions].

serverless/functions/serverless-functions-getting-started.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include::modules/serverless-document-attributes.adoc[]
22
[id="serverless-functions-getting-started"]
3-
= Getting started
3+
= Getting started with functions
44
:context: serverless-functions-getting-started
55
include::modules/common-attributes.adoc[]
66

@@ -20,3 +20,4 @@ Before you can complete the following procedures, you must ensure that you have
2020
include::modules/serverless-create-func-kn.adoc[leveloffset=+1]
2121
include::modules/serverless-build-func-kn.adoc[leveloffset=+1]
2222
include::modules/serverless-deploy-func-kn.adoc[leveloffset=+1]
23+
include::modules/serverless-functions-using-integrated-registry.adoc[leveloffset=+1]

serverless/functions/serverless-functions-setup.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ To enable the use of {FunctionsProductName} on your cluster, you must complete t
2020
* The xref:../../cli_reference/openshift_cli/getting-started-cli.adoc#cli-getting-started[`oc` CLI] is installed on your cluster.
2121
* The xref:../../serverless/installing-kn.adoc#installing-kn[Knative (`kn`) CLI] is installed on your cluster. Installing the `kn` CLI enables the use of `kn func` commands which you can use to create and manage functions.
2222
* You have installed Docker Container Engine or podman, and have access to an available image registry.
23-
* If you are using 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].
23+
* 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].
24+
* If you are using the OpenShift Container Registry, a cluster administrator must xref:../../registry/securing-exposing-registry.adoc#securing-exposing-registry[expose the registry].
2425

2526
include::modules/serverless-functions-podman.adoc[leveloffset=+1]
2627

2728
[id="next-steps_serverless-functions-setup"]
2829
== Next steps
2930

3031
* For more information about Docker Container Engine or podman, see xref:../../architecture/understanding-development.adoc#container-build-tool-options[Container build tool options].
31-
* See xref:../../serverless/functions/serverless-functions-getting-started.adoc#serverless-functions-getting-started[Getting started with {FunctionsProductName}].
32+
* See xref:../../serverless/functions/serverless-functions-getting-started.adoc#serverless-functions-getting-started[Getting started with functions].

0 commit comments

Comments
 (0)