Skip to content

Commit 79646f3

Browse files
authored
Merge pull request #40 from jetstack/fix-readme
Fixes for the PR comments in #35
2 parents c43be00 + 7e2cf0c commit 79646f3

File tree

2 files changed

+191
-113
lines changed

2 files changed

+191
-113
lines changed

README.md

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ the [Applications](https://console.cloud.google.com/kubernetes/application) page
104104

105105
<img src="https://user-images.githubusercontent.com/2195781/110791519-9acde700-8272-11eb-81f4-4f27fb8a174d.png" width="300" alt="The application page on GKE should show the test-1 application. The preflight deployment is failing because the user has not (yet) gone to http://platform.jetstack.io/ to register their cluster. This screenshot is stored in this issue: https://github.com/jetstack/jetstack-secure-gcm/issues/21">
106106

107-
**Note:** the preflight deploymnent is expected to be failing when the
107+
**Note:** the preflight deployment is expected to be failing when the
108108
application is first deployed. After registering your cluster on
109109
<https://platform.jetstack.io>, the deployment will start working. To register your cluster, keep reading the [next section](#step-2-log-into-the-jetstack-secure-dashboard).
110110

@@ -150,6 +150,7 @@ disk. You can call it `agent-config.yaml`.
150150

151151
For the next step, make sure you have the following information available
152152
to you:
153+
153154
- The **namespace** and **cluster name** on which you installed the
154155
application. If you are not sure about this, you can open the
155156
[Applications](https://console.cloud.google.com/kubernetes/application)
@@ -163,6 +164,7 @@ to you:
163164
page and click on the name of the cluster:
164165

165166
<img src="https://user-images.githubusercontent.com/2195781/109160131-af3fb900-7775-11eb-9a46-c1bcebdf8315.png" width="600px" alt="Click on the cluster name on the applications page in the Google Kubernetes Engine console. this screenshot is stored in this issue: https://github.com/jetstack/jetstack-secure-gcm/issues/21">
167+
166168
<img src="https://user-images.githubusercontent.com/2195781/109160135-afd84f80-7775-11eb-9f74-0847413cab7f.png" width="600px" alt="Grab the cluster location on the GKE console page of your GKE cluster. this screenshot is stored in this issue: https://github.com/jetstack/jetstack-secure-gcm/issues/21">
167169

168170
The next steps require to have a terminal open as well as to have the
@@ -189,14 +191,14 @@ gcloud container clusters get-credentials --zone=$LOCATION $CLUSTER
189191
You can then apply the Jetstack Secure agent configuration to your cluster:
190192

191193
```sh
192-
cat agent-config.yaml | sed '/namespace:/d' | kubectl -n $NAMESPACE apply -f-
194+
sed '/namespace:/d' agent-config.yaml | kubectl -n $NAMESPACE apply -f-
193195
kubectl -n $NAMESPACE rollout restart $(kubectl -n $NAMESPACE get deploy -oname | grep preflight)
194196
```
195197

196198
You may skip over the "Install agent" section:
197199

198-
<img src="https://user-images.githubusercontent.com/2195781/109156989-cb415b80-7771-11eb-910c-de247ad67ac2.png" width="600px" alt="Clicking on 'The agent is ready', you should see a green check mark. This screenshot is stored in this issue: https://github.com/jetstack/jetstack-secure-gcm/issues/21">
199-
=
200+
# <img src="https://user-images.githubusercontent.com/2195781/109156989-cb415b80-7771-11eb-910c-de247ad67ac2.png" width="600px" alt="Clicking on 'The agent is ready', you should see a green check mark. This screenshot is stored in this issue: https://github.com/jetstack/jetstack-secure-gcm/issues/21">
201+
200202
After skipping the "Install agent" section, follow the instructions in the
201203
"Check the agent is running" section.
202204

@@ -229,34 +231,32 @@ You can now click on "View clusters" to monitor your certificates. The
229231
documentation about the Jetstack Secure platform is available at
230232
<https://platform.jetstack.io/docs>.
231233

232-
Let us try with an example. We can create a CA issuer and sign a
234+
Let us try with an example. We can create a self-signed issuer and sign a
233235
certificate that only lasts for 30 days:
234236

235237
```sh
236-
docker run -it --rm -v "$(pwd)":/tmp frapsoft/openssl genrsa -out /tmp/ca.key 2048
237-
docker run -it --rm -v "$(pwd)":/tmp frapsoft/openssl req -x509 -new -nodes -key /tmp/ca.key -subj "/CN=example" -reqexts v3_req -extensions v3_ca -out /tmp/ca.crt
238-
kubectl create secret tls example-ca-key-pair --cert=ca.crt --key=ca.key
239238
kubectl apply -f- <<EOF
240239
apiVersion: cert-manager.io/v1
241240
kind: Issuer
242241
metadata:
243-
name: example-ca-issuer
242+
name: example-selfsigned-issuer
244243
spec:
245-
ca:
246-
secretName: example-ca-key-pair
244+
selfSigned: {}
247245
---
248-
apiVersion: cert-manager.io/v1alpha2
246+
apiVersion: cert-manager.io/v1
249247
kind: Certificate
250248
metadata:
251249
name: example-cert
252250
spec:
253251
duration: 721h # very short time to live
252+
secretName: example-cert-tls
253+
commonName: example-cert
254254
dnsNames:
255-
- example.com
255+
- example.com
256256
issuerRef:
257+
name: example-selfsigned-issuer
257258
kind: Issuer
258-
name: example-ca-issuer
259-
secretName: example-tls
259+
EOF
260260
```
261261

262262
A few seconds later, you will see the certificate `example-cert` appear in
@@ -266,20 +266,19 @@ the Jetstack Secure Platform UI:
266266

267267
### Step 3 (optional): set up the Google Certificate Authority Service
268268

269-
[Google Certificate Authority Service][] is a highly available, scalable Google Cloud
270-
service that enables you to simplify, automate, and customize the
271-
deployment, management, and security of private certificate authorities
272-
(CA).
269+
[Google Certificate Authority Service][google-cas] is a highly available,
270+
scalable Google Cloud service that enables you to simplify, automate, and
271+
customize the deployment, management, and security of private certificate
272+
authorities (CA).
273273

274-
[Google Certificate Authority Service]: https://cloud.google.com/certificate-authority-service/
275-
276-
If you wish to use [Google Certificate Authority
277-
Service](https://cloud.google.com/certificate-authority-service) to issue
274+
If you wish to use [Google Certificate Authority Service][google-cas] to issue
278275
certificates, you can create a root certificate authority and a subordinate
279-
certificate authority (i.e., an intermediate CA) on your Google Cloud
280-
project. To create a root and a subordinate CA, please follow the [official
276+
certificate authority (i.e., an intermediate CA) on your Google Cloud project.
277+
To create a root and a subordinate CA, please follow the [official
281278
documentation](https://cloud.google.com/certificate-authority-service/docs/creating-certificate-authorities).
282279

280+
[google-cas]: https://cloud.google.com/certificate-authority-service/
281+
283282
After creating the root and subordinate, set the following variable with
284283
the subordinate name:
285284

0 commit comments

Comments
 (0)