Skip to content

Commit 2311369

Browse files
authored
Merge pull request redhat-developer#1 from jannfis/fix-some-typos
Fixes some typos, rephrase some things.
2 parents 79febd1 + 3575683 commit 2311369

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Click on Argo CD from the OpenShift Web Console application launcher and then lo
4343

4444
## Configure OpenShift with Argo CD
4545

46-
In current Git repository, the [cluster](cluster/) directory contains OpenShift cluster configurations such as an OpenShift Web Console customization as well namespaces that should be created. Let's configure Argo CD to recursively sync the content of the [cluster](cluster/) directory to the OpenShift cluster. Initially, we can ask set the sync policy to manual in order to be able to review changes before rolling out configurations to the cluster.
46+
In the current Git repository, the [cluster](cluster/) directory contains OpenShift cluster configurations such as an OpenShift Web Console customization as well as namespaces that should be created. Let's configure Argo CD to recursively sync the content of the [cluster](cluster/) directory to the OpenShift cluster. Initially, we can set the sync policy to manual in order to be able to review changes before rolling out configurations to the cluster.
4747

4848
In the Argo CD dashboard, click on the **New App** button to add a new Argo CD application that syncs a Git repository containing cluster configurations with the OpenShift cluster.
4949

@@ -86,9 +86,9 @@ Now go back to the OpenShift Web Console and click on the **Application Launcher
8686
8787
![Argo CD - Cluster Config](images/gitops-11.png)
8888
89-
You an also check that a namespace called `spring-petclinic` is created on the cluster.
89+
You can also check that a namespace called `spring-petclinic` is created on the cluster.
9090
91-
Now that the configuration sync is in place, any changes in the Git repository will be automatically detect by Argo CD and would change the status of the **cluster-configs** to `OutOfSync` which implies a drift from the desired configuration. One can set the [sync policy to automated](https://argoproj.github.io/argo-cd/user-guide/auto_sync/) in order for Argo CD to automatically roll out changes form Git repository to the cluster.
91+
Now that the configuration sync is in place, any changes in the Git repository will be automatically detect by Argo CD and would change the status of the **cluster-configs** to `OutOfSync`, which implies a drift from the desired configuration. One can set the [sync policy to automated](https://argo-cd.readthedocs.io/en/stable/user-guide/auto_sync/) in order for Argo CD to automatically roll out changes form Git repository to the cluster.
9292
9393
## Deploy Applications with Argo CD
9494
@@ -116,7 +116,7 @@ Create a new Argo CD application by clicking on the **New App** button in the Ar
116116
> oc create -f argo/app.yaml
117117
> ```
118118
119-
As soon as the Argo CD application is created, a sync is started in order to rollout the Spring PetClinic manifests to the `spring-petclinic` namespace.
119+
Because we set up the sync policy to `Automatic`, as soon as the Argo CD application is created, a sync is started in order to rollout the Spring PetClinic manifests to the `spring-petclinic` namespace.
120120
121121
![Argo CD - Spring PetClinic](images/gitops-15.png)
122122
@@ -136,7 +136,7 @@ In addition, Argo CD constantly monitors the state of the deployed applications
136136
oc scale deployment spring-petclinic --replicas 2 -n spring-petclinic
137137
```
138138
139-
You would notice that the deployment momentarily scales up to 2 pods and immediately scales down again to 1 pod as Argo CD detects a drift from the Git repository and auto-heals the application on the OpenShift cluster.
139+
You would notice that the deployment momentarily scales up to 2 pods and immediately scales down again to 1 pod as Argo CD detects a drift from the Git repository and auto-heals the application on the OpenShift cluster. This behavior can be controlled by the [Self-heal](https://argo-cd.readthedocs.io/en/stable/user-guide/auto_sync/#automatic-self-healing) setting.
140140
141141
In Argo CD dashboard, click on the **app-spring-petclinic** and then **App Details** → **Events**. You can see the event details of Argo CD detecting that the deployment resources is out of sync on the cluster and resyncing the Git repository to correct it.
142142
@@ -147,7 +147,7 @@ In Argo CD dashboard, click on the **app-spring-petclinic** and then **App Detai
147147
148148
Although OpenShift GitOps by default installs an Argo CD instance for the cluster, there are use-cases where different application teams might need their own Argo CD instance confined to their own namespaces and applications. Therefore, OpenShift GitOps support creating additional Argo CD instances declaratively through creating `ArgoCD` resources.
149149
150-
In the OpenShift Web Console, create a project called `myargocd` and then click on the plus sign in the top navigation bar to then paste the following in the YAML editor, and then click on **Create**.
150+
In the OpenShift Web Console, create a project called `myargocd` and then click on the plus sign in the top navigation bar. Then, paste the following in the YAML editor, and click on **Create** afterwards:
151151
152152
```
153153
apiVersion: argoproj.io/v1alpha1
@@ -168,7 +168,7 @@ spec:
168168
> oc create -f argo/argocd.yaml
169169
> ```
170170
171-
Click on the **Topology** to view the Argo CD instance deployed in your names.
171+
Click on the **Topology** to view the Argo CD instance deployed in your namespace.
172172
173173
![Argo CD](images/gitops-17.png)
174174

0 commit comments

Comments
 (0)