Skip to content
This repository was archived by the owner on May 17, 2024. It is now read-only.

Commit 5e2b66a

Browse files
authored
Merge pull request #60 from wallrj/patch-1
Fix some typos in the README
2 parents a52f259 + b5e406a commit 5e2b66a

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

demo/README.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ separate providers (GKE and EKS), deploying:
1212
- [Cert-Manager](https://github.com/jetstack/cert-manager) to issue and manage
1313
certificates.
1414

15-
It will also demonstrate how to enable different authentication methods that dex
16-
supports, namely, username and password, and Github, however [more are
15+
It will also demonstrate how to enable different authentication methods that Dex
16+
supports, namely, username and password, and GitHub, however [more are
1717
available.](https://github.com/dexidp/dex#connectors)
1818

19-
## Perquisites
19+
## Prerequisites
2020
The tutorial will be using Cert-Manager to generate certificates signed by
2121
[Let's Encrypt](https://letsencrypt.org/) for components in both GKE and EKS
2222
using a DNS challenge. Although not the only way to generate certificates, the
@@ -25,7 +25,7 @@ project, and records of sub-domains of this domain will be created to assign DNS
2525
to the components. A Google Cloud Service Account will be created to manage
2626
these DNS challenges and it's secrets passed to Cert-Manager.
2727

28-
A Service Account has been created for terraform with it's secrets stored at
28+
A Service Account has been created for Terraform with its secrets stored at
2929
`~/.config/gcloud/terraform-admin.json`. The Service Account needs at least
3030
these IAM Roles attached:
3131
```
@@ -41,7 +41,7 @@ Project IAM Admin
4141
You have an AWS account with permissions to create an EKS cluster and other
4242
relevent permissions to create a fully fledged cluster, including creating
4343
load balancers, instance pools etc. Typically, these environment variables must
44-
be set when running terraform and deploying the manifests before OIDC
44+
be set when running `terraform` and deploying the manifests before OIDC
4545
authentication has been set up:
4646
```
4747
AWS_SECRET_ACCESS_KEY
@@ -51,8 +51,8 @@ AWS_ACCESS_KEY_ID
5151

5252
## Infrastructure
5353
First the GKE and EKS cluster will be created, along with secrets to be used for
54-
OIDC authentication for each cluster. The amazon terraform module has dependant
55-
resources on the google module, so the google module must be created first.
54+
OIDC authentication for each cluster. The Amazon Terraform module has dependant
55+
resources on the Google module, so the Google module must be created first.
5656

5757
```
5858
CLOUD=google make terraform_apply
@@ -77,14 +77,14 @@ gke.mydomain.company.net
7777
eks.mydomain.company.net
7878
```
7979

80-
Populate each configuration file with it's corresponding domain and Let's
80+
Populate each configuration file with its corresponding domain and Let's
8181
Encrypt contract email.
8282

8383
### GKE
8484

85-
Since the GKE cluster will be hosting Dex, the OIDC issuer, it's
85+
Since the GKE cluster will be hosting Dex, the OIDC issuer, its
8686
configuration file must contain how or what users will use to authenticate. Here
87-
we will show two methods, username and password, and Github.
87+
we will show two methods, username and password, and GitHub.
8888

8989
Usernames and passwords can be populated with the following block within the
9090
`dex` block.
@@ -106,7 +106,7 @@ htpasswd -bnBC 10 "" MyVerySecurePassword | tr -d ':'
106106
```
107107

108108
Dex also supports multiple 'connectors' that enable third party applications to
109-
provide OAuth to it's system. For Github, this involves creating an 'OAuth App'.
109+
provide OAuth to it's system. For GitHub, this involves creating an 'OAuth App'.
110110
The `Authorization callback URL` should be populated with the Dex callback URL, i.e.
111111
`https://dex.gke.mydomain.company.net/callback`.
112112
The resulting `Client ID` and `Client Secret` can then be used to populate the
@@ -125,13 +125,13 @@ configuration file:
125125
},
126126
```
127127

128-
You can find more information on github OAuth apps
128+
You can find more information on GitHub OAuth apps
129129
[here.](https://developer.github.com/v3/oauth/)
130130

131-
Finally, Dex needs to be configured to also accept the gangway client in the EKS
132-
cluster. To do this, we add a Dex Client block in the configuration. We need to
133-
populate it's redirect URL as well as the client ID and client secret using
134-
values that were created in the `./manifests/amazon-config.json` by terraform.
131+
Finally, Dex needs to be configured to also accept the Gangway client in the EKS
132+
cluster. To do this, we add a `dex.Client` block in the configuration. We need to
133+
populate its redirect URL as well as the client ID and client secret using
134+
values that were created in the `./manifests/amazon-config.json` by Terraform.
135135
The resulting block should would look like:
136136

137137
```
@@ -181,7 +181,7 @@ The resulting `gke-config.jsonnet` file should look similar to
181181
### EKS
182182

183183
The EKS cluster will not be hosting the dex server so only needs to be
184-
configured with it's domain, Dex's domain and the Let's Encrypt contact email.
184+
configured with its domain, Dex's domain and the Let's Encrypt contact email.
185185
The resuting `eks-config.jsonnet` file should look similar to:
186186

187187
```
@@ -223,7 +223,7 @@ Verify that the ingress has been configured to what you were expecting.
223223
$ kubectl get ingressroutes -n auth
224224
```
225225

226-
You should now see the DNS challenge attempting to be furfilled by Cert-Manager
226+
You should now see the DNS challenge attempting to be fullfilled by Cert-Manager
227227
in your DNS Zone details in the Google Cloud console.
228228

229229
Once complete, three TLS secrets will be generated, `gangway-tls`, `dex-tls`,
@@ -233,20 +233,20 @@ and `kube-oidc-proxy-tls`.
233233
$ kubectl get -n auth secret
234234
```
235235

236-
You can save these certifcates locally, and resotre them any time using:
236+
You can save these certifcates locally, and restore them any time using:
237237
```
238238
$ make manifests_backup_certificates
239239
$ make manifests_restore_certificates
240240
```
241241

242-
An A record can now be created so the DNS can be resolved to the Contour Load
243-
Balancer public IP Adress. Take a note of the external-IP address exposed:
242+
An `A` record can now be created so that DNS can be resolve the Contour Load
243+
Balancer public IP address. Take a note of the external-IP address exposed:
244244

245245
```
246246
$ kubectl get svc contour -n auth
247247
```
248248

249-
Create an A record set with a wild card sub-domain to your domain, with some
249+
Create a wildcard `A` record (matching all sub-domains), with some
250250
reasonable TTL pointing to the exposed IP address of the Contour Load Balancer.
251251

252252
```
@@ -275,14 +275,14 @@ $ export CLOUD=amazon
275275
$ make manifests_apply
276276
```
277277

278-
Get the AWS DNS URL for the contour Load Balancer.
278+
Get the AWS DNS URL for the Contour Load Balancer.
279279
```
280280
$ export KUBECONFIG=.kubeconfig-amazon
281281
$ kubectl get svc -n auth
282282
```
283283

284-
Once the the contour LoadBalancer has an external URL, we need to create a CNAME
285-
record set to resolve the DNS.
284+
Once the the Contour Load Balancer has an external URL, we need to create a `CNAME`
285+
record:
286286
```
287287
DNS name: *.eks.mydomain.company.net
288288
Record resource type: CNAME
@@ -291,5 +291,5 @@ Canonical name: $CONTOUR_AWS_URL
291291

292292
When components have their TLS secrets, you will then be able to login to the
293293
Gangway portal on EKS and download your Kubeconfig. Again, when trying this
294-
Kubeconfig, you should initially be greeted with unauthorized to that resource
294+
Kubeconfig, you will initially be greeted with an "unauthorized" error message
295295
until RBAC permissions have been granted to this user.

0 commit comments

Comments
 (0)