Skip to content

Commit

Permalink
Merge pull request #12598 from gsmet/openshift-fix-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
gastaldi authored Oct 9, 2020
2 parents e8888ac + c6d7e21 commit 848121c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/deploying-to-kubernetes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
----
Expand Down
6 changes: 3 additions & 3 deletions docs/src/main/asciidoc/funqy-knative-events.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/maven-tooling.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public class OpenshiftConfig implements PlatformConfiguration {
Map<String, HostAliasConfig> hostAliases;

/**
* If true, an Openshift Route will be created
* If true, an OpenShift Route will be created
*/
@ConfigItem
boolean expose;
Expand Down

0 comments on commit 848121c

Please sign in to comment.