From c642fe4be02a4bd95f201f646b2118df2cc46db9 Mon Sep 17 00:00:00 2001 From: Vikram Goyal Date: Wed, 6 May 2020 14:23:59 +1000 Subject: [PATCH] dedicated fixes --- applications/projects/working-with-projects.adoc | 2 +- .../about-odo-in-a-restricted-environment.adoc | 2 ++ cloud_infrastructure_access/dedicated-aws-dc.adoc | 2 +- cloud_infrastructure_access/dedicated-aws-peering.adoc | 4 ++-- modules/creating-a-project-using-the-CLI.adoc | 2 +- .../odc-creating-projects-using-developer-perspective.adoc | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/applications/projects/working-with-projects.adoc b/applications/projects/working-with-projects.adoc index 04c3adf7dba0..7059fc773703 100644 --- a/applications/projects/working-with-projects.adoc +++ b/applications/projects/working-with-projects.adoc @@ -10,7 +10,7 @@ isolation from other communities. [NOTE] ==== -Projects starting with `openshift-` and `kube-` are xref:../../authentication/using-rbac.adoc#rbac-default-projects_using-rbac[default projects]. These projects host cluster components that run as Pods and other infrastructure components. As such, {product-title} does not allow you to create Projects starting with `openshift-` or `kube-` using the `oc new-project` command. Cluster administrators can create these Projects using the xref:../../cli_reference/openshift_cli/administrator-cli-commands.adoc#new-project[`oc adm new-project` command]. +Projects starting with `openshift-` and `kube-` are xref:../../authentication/using-rbac.adoc#rbac-default-projects_using-rbac[default projects]. These projects host cluster components that run as Pods and other infrastructure components. As such, {product-title} does not allow you to create Projects starting with `openshift-` or `kube-` using the `oc new-project` command. Cluster administrators can create these Projects using the `oc adm new-project` command. ==== include::modules/creating-a-project-using-the-web-console.adoc[leveloffset=+1] diff --git a/cli_reference/openshift_developer_cli/using_odo_in_a_restricted_environment/about-odo-in-a-restricted-environment.adoc b/cli_reference/openshift_developer_cli/using_odo_in_a_restricted_environment/about-odo-in-a-restricted-environment.adoc index eceb3543fec5..079402289472 100644 --- a/cli_reference/openshift_developer_cli/using_odo_in_a_restricted_environment/about-odo-in-a-restricted-environment.adoc +++ b/cli_reference/openshift_developer_cli/using_odo_in_a_restricted_environment/about-odo-in-a-restricted-environment.adoc @@ -15,5 +15,7 @@ To start working in a disconnected cluster, you must first xref:../../../cli_ref After you push the `odo init image`, you must xref:../../../cli_reference/openshift_developer_cli/using_odo_in_a_restricted_environment/creating-and-deploying-a-component-to-the-disconnected-cluster.adoc#mirroring-a-supported-builder-image_creating-and-deploying-a-component-to-the-disconnected-cluster[mirror a supported builder image] from the registry, xref:../../../cli_reference/openshift_developer_cli/using_odo_in_a_restricted_environment/creating-and-deploying-a-component-to-the-disconnected-cluster.adoc#overwriting-the-mirror-registry_creating-and-deploying-a-component-to-the-disconnected-cluster[overwrite a mirror registry] and then xref:../../../cli_reference/openshift_developer_cli/using_odo_in_a_restricted_environment/creating-and-deploying-a-component-to-the-disconnected-cluster.adoc#creating-a-nodejs-application-with-odo_creating-and-deploying-a-component-to-the-disconnected-cluster[create your application]. A builder image is necessary to configure a runtime environment for your application and also contains the build tool needed to build your application, for example npm for Node.js or Maven for Java. A mirror registry contains all the necessary dependencies for your application. .Additional resources +ifdef::openshift-enterprise,openshift-webscale[] * xref:../../../installing/install_config/installing-restricted-networks-preparations.adoc#installation-about-mirror-registry_installing-restricted-networks-preparations[Creating a mirror registry for installation in a restricted network] +endif::[] * xref:../../../registry/accessing-the-registry.adoc#registry-accessing-directly_accessing-the-registry[Accessing the registry] diff --git a/cloud_infrastructure_access/dedicated-aws-dc.adoc b/cloud_infrastructure_access/dedicated-aws-dc.adoc index ce577224a3b4..f209b6e46ccd 100644 --- a/cloud_infrastructure_access/dedicated-aws-dc.adoc +++ b/cloud_infrastructure_access/dedicated-aws-dc.adoc @@ -1,4 +1,4 @@ -[id="dedicated-aws-direct-connect"] +[id="dedicated-aws-dc"] = Configuring AWS Direct Connect include::modules/common-attributes.adoc[] :context: dedicated-aws-direct-connect diff --git a/cloud_infrastructure_access/dedicated-aws-peering.adoc b/cloud_infrastructure_access/dedicated-aws-peering.adoc index 569fb730a35d..b6c1cca2490d 100644 --- a/cloud_infrastructure_access/dedicated-aws-peering.adoc +++ b/cloud_infrastructure_access/dedicated-aws-peering.adoc @@ -1,4 +1,4 @@ -[id="dedicated-aws-vpc-peering"] +[id="dedicated-aws-peering"] = Configuring AWS VPC peering include::modules/common-attributes.adoc[] :context: dedicated-aws-peering @@ -15,7 +15,7 @@ include::modules/dedicated-aws-vpc-peering-terms.adoc[leveloffset=+1] include::modules/dedicated-aws-vpc-initiating-peering.adoc[leveloffset=+1] .Additional resources -* xref:../../getting_started/cloud_infrastructure_access/dedicated-aws-access.html#dedicated-aws-ocm-iam-role[Logging into the Web Console for the OSD AWS Account] +* xref:../cloud_infrastructure_access/dedicated-aws-access.adoc#dedicated-aws-ocm-iam-role[Logging into the Web Console for the OSD AWS Account] include::modules/dedicated-aws-vpc-accepting-peering.adoc[leveloffset=+1] include::modules/dedicated-aws-vpc-configuring-routing-tables.adoc[leveloffset=+1] diff --git a/modules/creating-a-project-using-the-CLI.adoc b/modules/creating-a-project-using-the-CLI.adoc index 0ceb1f3cf6b6..d9dec4381a8d 100644 --- a/modules/creating-a-project-using-the-CLI.adoc +++ b/modules/creating-a-project-using-the-CLI.adoc @@ -9,7 +9,7 @@ If allowed by your cluster administrator, you can create a new project. [NOTE] ==== -Projects starting with `openshift-` and `kube-` are considered critical by {product-title}. As such, {product-title} does not allow you to create Projects starting with `openshift-` or `kube-` using the `oc new-project` command. Cluster administrators can create these Projects using the xref:../../cli_reference/openshift_cli/administrator-cli-commands.adoc#new-project[`oc adm new-project` command]. +Projects starting with `openshift-` and `kube-` are considered critical by {product-title}. As such, {product-title} does not allow you to create Projects starting with `openshift-` or `kube-` using the `oc new-project` command. Cluster administrators can create these Projects using the `oc adm new-project` command. ==== .Procedure diff --git a/modules/odc-creating-projects-using-developer-perspective.adoc b/modules/odc-creating-projects-using-developer-perspective.adoc index 816f14f9dbb7..2608e21725a6 100644 --- a/modules/odc-creating-projects-using-developer-perspective.adoc +++ b/modules/odc-creating-projects-using-developer-perspective.adoc @@ -9,7 +9,7 @@ You can use the *Developer* perspective in the {product-title} web console to cr [NOTE] ==== -Projects starting with `openshift-` and `kube` host cluster components that run as Pods and other infrastructure components. As such, {product-title} does not allow you to create Projects starting with `openshift-` or `kube-` using the CLI. Cluster administrators can create these Projects using the xref:../../cli_reference/openshift_cli/administrator-cli-commands.adoc#new-project[`oc adm new-project` command]. +Projects starting with `openshift-` and `kube` host cluster components that run as Pods and other infrastructure components. As such, {product-title} does not allow you to create Projects starting with `openshift-` or `kube-` using the CLI. Cluster administrators can create these Projects using the `oc adm new-project` command. ==== .Prerequisites