From f86f1df256313f1314036b9b1b4767e6c293c5be Mon Sep 17 00:00:00 2001 From: Leo Puvilland Date: Mon, 4 Dec 2023 18:01:43 -0800 Subject: [PATCH] Fix OpenShift Documentation --- modules/developer_guide/pages/openshift.adoc | 25 ++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/developer_guide/pages/openshift.adoc b/modules/developer_guide/pages/openshift.adoc index 0a70da8..7351583 100644 --- a/modules/developer_guide/pages/openshift.adoc +++ b/modules/developer_guide/pages/openshift.adoc @@ -15,8 +15,8 @@ Origin in a virtual machine. === OpenShift in Fedora Infrastructure Fedora has two OpenShift deployments: -https://os.stg.fedoraproject.org/[Staging OpenShift] and -https://os.fedoraproject.org/[Production OpenShift]. In addition to +https://console-openshift-console.apps.ocp.stg.fedoraproject.org/[Staging OpenShift] and +https://console-openshift-console.apps.ocp.fedoraproject.org/[Production OpenShift]. In addition to being the staging deployment of OpenShift itself, the staging deployment is intended to be a place for developers to deploy the staging version of their applications. @@ -35,15 +35,15 @@ limited usefulness. ==== Command-line Interface Although the CLI is also locked down to be read only, it is possible to -view logs and request debugging containers, but only from batcave01. For +view logs and request debugging containers from os-control01 or your local machine. For example, to view the logs of a deployment in staging: .... -$ ssh batcave01.iad2.fedoraproject.org -$ oc login os-master01.stg.iad2.fedoraproject.org -You must obtain an API token by visiting https://os.stg.fedoraproject.org/oauth/token/request +$ ssh os-control01.iad2.fedoraproject.org +$ oc login api.ocp.fedoraproject.org:6443 +You must obtain an API token by visiting https://oauth-openshift.apps.ocp.fedoraproject.org/oauth/token/request -$ oc login os-master01.stg.iad2.fedoraproject.org --token= +$ oc login api.ocp.fedoraproject.org:6443 --token= $ oc get pods librariesio2fedmsg-28-bfj52 1/1 Running 522 28d $ oc logs librariesio2fedmsg-28-bfj52 @@ -82,19 +82,20 @@ configurations that won't work. You will likely need (at a minimum) the following objects: * A -https://docs.openshift.com/container-platform/4.10/cicd/builds/understanding-buildconfigs.html[BuildConfig] +https://docs.openshift.com/container-platform/4.14/cicd/builds/understanding-buildconfigs.html[BuildConfig] - This defines how your container is built. * An -https://docs.openshift.com/container-platform/4.10/openshift_images/image-streams-manage.html[ImageStream] +https://docs.openshift.com/container-platform/4.14/openshift_images/image-streams-manage.html[ImageStream] - This references a "stream" of container images and lets you trigger deployments or image builds based on changes in a stream. * A -https://docs.openshift.com/container-platform/4.10/applications/deployments/what-deployments-are.html[DeploymentConfig] +https://docs.openshift.com/container-platform/4.14/applications/deployments/what-deployments-are.html[Deployment] - This defines how your container is deployed (how many replicas, what ports are available, etc) +- Note: DeploymentConfigs are deprecated, do not use them! * A -https://docs.openshift.com/container-platform/4.10/applications/connecting_applications_to_services/getting-started-with-service-binding.html[Service] +https://docs.openshift.com/container-platform/4.14/applications/connecting_applications_to_services/getting-started-with-service-binding.html[Service] - An internal load balancer that routes traffic to your pods. * A -https://docs.openshift.com/container-platform/4.10/networking/routes/route-configuration.html[Route] +https://docs.openshift.com/container-platform/4.14/networking/routes/route-configuration.html[Route] - This exposes a Service as a host name.