Skip to content

Commit 0bddac9

Browse files
committed
Fix some typos
1 parent d27937d commit 0bddac9

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

content/modules/ROOT/pages/01-getting-started.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ WARNING: Using insecure TLS client config. Setting this option is not supported!
6767

6868
Login successful.
6969

70-
You have access to the following projects and can switch between them with 'oc project <projectname>':
70+
You have access to the following projects and can switch between them with 'oc project <project-name>':
7171

7272
* {user}-argocd
7373
{user}-dev

content/modules/ROOT/pages/03-configuration.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ As indicated here, the ConfigMap is being rendered by the Operator based on the
4848
oc get argocd argocd -n {user}-argocd -o yaml | oc neat
4949
----
5050

51-
One of the benefits the Operator provides is a schema based approach to configuation that is supported
51+
One of the benefits the Operator provides is a schema based approach to configuration that is supported
5252
the Kubernetes `explain` command. Here are a couple of examples for you to try:
5353

5454
[.console-input]
@@ -209,7 +209,7 @@ STATUS: Progressing
209209
MESSAGE
210210
----
211211

212-
Note the command confirms that Argo CD considers the PVC to be `Progressing`, let's change that with the following
212+
Note the command confirms that Argo CD considers the PVC to be `Progressing`, let's change that with the following
213213
custom health check writtin in LUA to override the default one:
214214

215215
[source,yaml,subs="+macros,attributes+"]
@@ -289,8 +289,8 @@ STATUS: Healthy
289289
MESSAGE: Pending
290290
----
291291

292-
Great, our updated health check is working! The status is returned as `Healthy` to Argo CD but we set the message field to the
293-
Kubernetes status of the PVC to provide additional context.
292+
Great, our updated health check is working! The status is returned as `Healthy` to Argo CD but we set the message field to the
293+
Kubernetes status of the PVC to provide additional context.
294294

295295
Let's go ahead and patch it into our ArgoCD Custom Resource on the cluster to take advantage of it:
296296

@@ -385,8 +385,8 @@ The Argo CD user interface, when viewing a pod, can optionally show a link:https
385385
tab similar to what you see in the OpenShift console. This can be useful for organizations which use the Argo CD UI
386386
as the primary means for managing Kubernetes resources.
387387

388-
While we previously gave permissions for the terminal in the previous module, by default this is not enabled. To verify this,
389-
in the health application that was deployed previously click on the pod.
388+
While we previously gave permissions for the terminal in the previous module, by default this is not enabled. To verify this,
389+
in the health application that was deployed previously click on the pod.
390390

391391
image::argocd-select-pod.png[]
392392

@@ -395,9 +395,9 @@ Note that the only tabs available are `SUMMARY`, `EVENTS` and `LOGS` with no `TE
395395
image::argocd-pod-tabs.png[]
396396

397397
As mentioned previously, not all Argo CD settings are defined in the ArgoCD Custom Resource and enabling
398-
the terminal is one of those cases.
398+
the terminal is one of those cases.
399399

400-
For cases like this where a setting is not defined, we can use the `extraConfig` to have the operator add these items
400+
For cases like this where a setting is not defined, we can use the `extraConfig` to have the operator add these items
401401
directly to the `argocd-cm` ConfigMap. Whatever is defined, correctly or incorrectly, will be copied
402402
to this ConfigMap so some care should be taken when using this feature.
403403

@@ -427,7 +427,7 @@ image::argocd-terminal.png[]
427427

428428
[IMPORTANT]
429429
As per the link:https://argo-cd.readthedocs.io/en/latest/operator-manual/web_based_terminal/[Argo CD Documentation, window="_blank"], the `argocd-server` ServiceAccount must be granted additional permissions with Kubernetes RBAC
430-
to enable the terminal. These permissions have already been applied by specifying a custom ClusterRole for the GitOps Operator.
430+
to enable the terminal. These permissions have already been applied by specifying a custom ClusterRole for the GitOps Operator.
431431

432432
[#config-conclusion]
433433
== Conclusion

content/modules/ROOT/pages/04-applicationsets.adoc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ and the newer ApplicationSets in Argo CD.
77
[#app-of-apps]
88
== App-of-Apps
99

10-
Before we delve into ApplicatioSets, let's dive into the useful link:https://argo-cd.readthedocs.io/en/latest/operator-manual/cluster-bootstrapping/#app-of-apps-pattern[App-of-Apps, window="_blank"]
11-
pattern which predates ApplicationSets.
10+
Before we delve into ApplicationSets, let's dive into the useful link:https://argo-cd.readthedocs.io/en/latest/operator-manual/cluster-bootstrapping/#app-of-apps-pattern[App-of-Apps, window="_blank"]
11+
pattern which predates ApplicationSets.
1212

13-
The concept of App-of-Apps is that you have an Application in Argo CD that points to a location that consists only of Applications. This enables bootstrapping a set of
13+
The concept of App-of-Apps is that you have an Application in Argo CD that points to a location that consists only of Applications. This enables bootstrapping a set of
1414
Applications from a single Application and is useful in use cases such as cluster configuration and same app with multiple environments scenarios.
1515

16-
Before we can deploy the App-of-Apps, we first need to deploy a health check for the Application resource which is not included as a health check in Argo CD at this time.
16+
Before we can deploy the App-of-Apps, we first need to deploy a health check for the Application resource which is not included as a health check in Argo CD at this time.
1717

1818
[NOTE]
1919
This is because in Argo CD 1.x the default Application health check was removed, the author of this workshop link:https://github.com/argoproj/argo-cd/issues/16870[disagrees, window="_blank"] with
@@ -99,7 +99,7 @@ using the App-of-Apps pattern as per the link:https://argo-cd.readthedocs.io/en/
9999
The kustomize section is used to transform the destination for the Application for your specific user. This is only needed
100100
here as all users are using the same repository, typically this would not be required.
101101

102-
In this section we have seen how we can use App-of-Apps to deploy multiple Applications stored in git. However this list of
102+
In this section we have seen how we can use App-of-Apps to deploy multiple Applications stored in git. However this list of
103103
Applications is static, what if we want to create Applications dynamically based on external sources? This is where
104104
ApplicationSets come into play.
105105

@@ -144,7 +144,7 @@ Deploy the ApplicationSet using the following command:
144144
[.console-input]
145145
[source,sh,subs="attributes",role=execute]
146146
----
147-
sed 's/$USER/{user}/' ~/workshop/content/modules/ROOT/examples/applicationsets/coolstore-list-appset.yaml | oc apply -n {user}-argocd -f -
147+
sed 's/$USER/{user}/' ~/workshop/content/modules/ROOT/examples/applicationsets/coolstore-list-appset.yaml | oc apply -n {user}-argocd -f -
148148
----
149149
150150
Next have a look at the ApplicationSet that was deployed with this command:
@@ -236,7 +236,7 @@ In this example we will deploy the front-end of the coolstore using an Applicati
236236
git generator supports two modes, file and directory. In our case we will leverage the directory mode to
237237
point the generator at a set of kustomize overlays in the repository.
238238
239-
For those not familiar with kustomize, a common pattern when deploying an application with kustomize for multiple
239+
For those not familiar with kustomize, a common pattern when deploying an application with kustomize for multiple
240240
environments is to have a repository that contains a `base` and `overlays` folders. The base folder contains
241241
all of the manifests to be deployed. The `overlays` are used to patch the base to handle any
242242
environment specific differences.
@@ -276,7 +276,7 @@ find ~/workshop/content/modules/ROOT/examples/coolstore-web -print | sort|sed -e
276276
----
277277
278278
Let's deploy these applications using an ApplicationSet using the git generator. However
279-
the git generator is somewhat more complex then the previous static list example so let's test
279+
the git generator is somewhat more complex then the previous static list example so let's test
280280
it locally first to verify that it works.
281281
282282
Output the ApplicationSet to a file replacing the workshop $USER variable with your user:
@@ -339,7 +339,7 @@ spec:
339339
syncPolicy:
340340
automated:
341341
prune: true
342-
selfHeal: true
342+
selfHeal: true
343343
----
344344
<1> We are using the git generator to create an Application for every directory in the target repository and path
345345
<2> The target path, each sub-directory in this path will be used to create an application. In our case the `dev` and `prod` overlays
@@ -381,12 +381,12 @@ Using the CLI to generate Applications is very useful when debugging complex App
381381
you do not have to spend the time deploying it to the cluster and looking at the Status block to
382382
understand why it isn't working.
383383
384-
Now that the generation has been verified, go ahead and deploy it:
384+
Now that the generation has been verified, go ahead and deploy it:
385385
386386
[.console-input]
387387
[source,sh,subs="attributes",role=execute]
388388
----
389-
sed 's/$USER/{user}/' ~/workshop/content/modules/ROOT/examples/applicationsets/coolstore-git-appset.yaml | oc apply -n {user}-argocd -f -
389+
sed 's/$USER/{user}/' ~/workshop/content/modules/ROOT/examples/applicationsets/coolstore-git-appset.yaml | oc apply -n {user}-argocd -f -
390390
----
391391
392392
Check that the Applications have been created:

0 commit comments

Comments
 (0)