From c6d7e21de79e3a3e07e1762111e33526cd050704 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 8 Oct 2020 11:36:33 +0200 Subject: [PATCH] Small OpenShift documentation fixes --- docs/src/main/asciidoc/deploying-to-kubernetes.adoc | 4 ++-- docs/src/main/asciidoc/funqy-knative-events.adoc | 6 +++--- docs/src/main/asciidoc/maven-tooling.adoc | 2 +- .../io/quarkus/kubernetes/deployment/OpenshiftConfig.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/src/main/asciidoc/deploying-to-kubernetes.adoc b/docs/src/main/asciidoc/deploying-to-kubernetes.adoc index f8a2bdeeeca85..40b83a2bdbfb5 100644 --- a/docs/src/main/asciidoc/deploying-to-kubernetes.adoc +++ b/docs/src/main/asciidoc/deploying-to-kubernetes.adoc @@ -242,7 +242,7 @@ Custom annotations can be added in a way similar to labels.For example to add th [source] ---- quarkus.kubernetes.annotations.foo=bar -quarkus."app.quarkus/id"=42 +quarkus.kubernetes.annotations."app.quarkus/id"=42 ---- [#env-vars] @@ -755,7 +755,7 @@ These manifests can be deployed as is to a running cluster, using `kubectl`: kubectl apply -f target/kubernetes/openshift.json ---- -Openshift users might want to use `oc` instead of `kubectl`: +OpenShift users might want to use `oc` instead of `kubectl`: [source] ---- diff --git a/docs/src/main/asciidoc/funqy-knative-events.adoc b/docs/src/main/asciidoc/funqy-knative-events.adoc index 869755ed7542f..d04fcfdeff2eb 100644 --- a/docs/src/main/asciidoc/funqy-knative-events.adoc +++ b/docs/src/main/asciidoc/funqy-knative-events.adoc @@ -28,7 +28,7 @@ To complete this guide, you need: Setting up Knative locally in a Minikube environment is beyond the scope of this guide. It is advised to follow https://redhat-developer-demos.github.io/knative-tutorial/knative-tutorial/index.html[this] Knative Tutorial -put together by Red Hat. It walks through how to set up Knative on Minikube or Openshift in a local environment. +put together by Red Hat. It walks through how to set up Knative on Minikube or OpenShift in a local environment. NOTE: Specifically you should run the link:https://redhat-developer-demos.github.io/knative-tutorial/knative-tutorial-eventing/eventing-trigger-broker.html[Brokers and Triggers] tutorial as this guide requires that you can invoke on a Broker to trigger the quickstart code. @@ -231,9 +231,9 @@ docker push yourAccountName/funqy-knative-events-quickstart Again, make sure to replace `yourAccountName` with your docker or quay account name when you run `docker push`. -== Deploy to Kubernetes/Openshift +== Deploy to Kubernetes/OpenShift -The first step is to define a Kubernetes/Openshift service to points to your the docker image you created and pushed +The first step is to define a Kubernetes/OpenShift service to points to your the docker image you created and pushed during build. Take a look at {quickstarts-tree-url}/funqy-quickstarts/funqy-knative-events-quickstart/src/main/k8s/funqy-service.yaml[funqy-service.yaml] [source, yaml] diff --git a/docs/src/main/asciidoc/maven-tooling.adoc b/docs/src/main/asciidoc/maven-tooling.adoc index 225d8aaae94bf..71ce3848d08db 100644 --- a/docs/src/main/asciidoc/maven-tooling.adoc +++ b/docs/src/main/asciidoc/maven-tooling.adoc @@ -151,7 +151,7 @@ Hit `CTRL+C` to stop the application. === Remote Development Mode -It is possible to use development mode remotely, so that you can run Quarkus in a container environment (such as Openshift) +It is possible to use development mode remotely, so that you can run Quarkus in a container environment (such as OpenShift) and have changes made to your local files become immediately visible. This allows you to develop in the same environment you will actually run your app in, and with access to the same services. diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java index 61f43320f7a0c..a1c81fa1d6415 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java @@ -221,7 +221,7 @@ public class OpenshiftConfig implements PlatformConfiguration { Map hostAliases; /** - * If true, an Openshift Route will be created + * If true, an OpenShift Route will be created */ @ConfigItem boolean expose;