Skip to content

Commit e1b6b0b

Browse files
authored
doc(*): Documentation changes, suggestions, fixes (#548)
* doc(src/users/ssh-keys.md): include command add-ssh after key creation * doc(src/troubleshooting/index.md): add notes for eventual ssh-agent env needs * doc(src/quickstart/provider/gke/boot.md): add instructions on having kubectl script available * doc(src/quickstart/provider/aws/boot.md): add instructions on having kubectl script available * doc(src/quickstart/provider/aws/install-aws.md): add note for required package * doc(src/quickstart/install-cli-tools.md): add note for required package * doc(src/installing-workflow/configuring-object-storage.md): add complimentary info for steps * doc(src/quickstart/deploy-an-app.md): fix relative URL path * doc(src/quickstart/provider/aws/boot.md): fix typos, output format and URLs * doc(src/quickstart/provider/aws/dns.md): fix URL prefix * doc(src/quickstart/deploy-an-app.md): reorg final section including deis keys:add * doc(src/quickstart/install-cli-tools.md): add helmc binary to path * doc(src/quickstart/install-cli-tools.md): include notes for Linux users * doc(src/quickstart/install-cli-tools.md): add note about version numbers * doc(various): fix typos * doc(quickstart): use admonition note/important format. * docs(cli-tools): update example version to 2.7.0
1 parent 4196ca3 commit e1b6b0b

9 files changed

Lines changed: 65 additions & 14 deletions

File tree

src/installing-workflow/configuring-object-storage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ After setting a `STORAGE_TYPE` environment variable to the desired object storag
4949
!!! note
5050
These environment variables should be set **before** running `helmc generate` in Step 5.
5151

52-
**Option 2:** Using template file `tpl/generate_params.toml`
52+
**Option 2:** Using template file `tpl/generate_params.toml` available at `$(helmc home)/workspace/charts/workflow-v2.7.0`
5353

54-
* Edit Helm Classic chart by running `helmc edit workflow-v2.7.0` and look for the template file `tpl/generate_params.toml`
54+
* Edit Helm Classic chart by running `helmc edit workflow-v2.7.0` and look for the template file `tpl/generate_params.toml` (make sure you have the `$EDITOR` environment variable set with your favorite text editor)
5555
* Update the `storage` parameter to reference the platform you are using, e.g. `s3`, `azure`, `gcs`, or `swift`
5656
* Find the corresponding section for your storage type and provide appropriate values including region, bucket names, and access credentials.
5757
* Save your changes to `tpl/generate_params.toml`.
@@ -61,7 +61,7 @@ After setting a `STORAGE_TYPE` environment variable to the desired object storag
6161

6262
### Step 5: Generate manifests
6363

64-
Generate the Workflow chart by running `helmc generate -x manifests workflow-v2.7.0`.
64+
Generate the Workflow chart by running `helmc generate -x manifests workflow-v2.7.0` (if you have previously run this step, make sure you add `-f` to force its regeneration).
6565

6666
### Step 6: Verify credentials
6767

src/quickstart/deploy-an-app.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,20 @@ proper-barbecue-v18-cmd-rk644 up (v18)
101101
proper-barbecue-v18-cmd-0ag04 up (v18)
102102
```
103103

104-
Congratulations! You have deployed, configured, and scaled your first application using Deis Workflow. There is a lot
105-
more you can do with Deis Workflow, play around with the CLI:
104+
Congratulations! You have deployed, configured, and scaled your first application using Deis Workflow.
105+
106+
## Going Further
107+
There is a lot more you can do with Deis Workflow, play around with the CLI:
108+
109+
!!! important
110+
In order to have permission to push an app you must add a SSH key to your user on the Deis Workflow.
111+
For more information, please check [Users and SSH Keys](../users/ssh-keys/) and [Troubleshooting Workflow](../troubleshooting/).
106112

107113
* Roll back to a previous release with `deis rollback -a proper-barbecue`
108114
* See application logs with `deis logs -a proper-barbecue`
109115
* Try one of our other example applications like:
110116
* [deis/example-ruby-sinatra](https://github.com/deis/example-ruby-sinatra)
111117
* [deis/example-nodejs-express](https://github.com/deis/example-nodejs-express)
112118
* [deis/example-java-jetty](https://github.com/deis/example-java-jetty)
113-
* Read about using application [Buildpacks](../applications/using-buildpacks.md) or [Dockerfiles](../applications/using-dockerfiles.md)
119+
* Read about using application [Buildpacks](../applications/using-buildpacks) or [Dockerfiles](../applications/using-dockerfiles.md)
114120
* Join our [#community slack channel](https://slack.deis.io) and meet the team!

src/quickstart/install-cli-tools.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,19 @@ Install the latest `deis` client for Linux or Mac OS X with:
1010
The installer places the `deis` binary in your current directory, but you
1111
should move it somewhere in your $PATH:
1212

13+
$ sudo ln -fs $PWD/deis /usr/local/bin/deis
14+
15+
*or*:
16+
1317
$ sudo mv $PWD/deis /usr/local/bin/deis
1418

1519
Check your work by running `deis version`:
1620

1721
$ deis version
18-
2.1.0
22+
2.7.0
23+
24+
!!! note
25+
Note that version numbers may vary as new releases become available
1926

2027
## Helm Classic Installation
2128

@@ -25,9 +32,16 @@ Install the latest `helmc` cli for Linux or Mac OS X with:
2532

2633
$ curl -sSL https://get.helm.sh | bash
2734

28-
The installer places the `helm` binary in your current directory, but you
35+
!!! note
36+
Note that the `unzip` package is a requirement for this command
37+
38+
The installer places the `helmc` binary in your current directory, but you
2939
should move it somewhere in your $PATH:
3040

41+
$ sudo ln -fs $PWD/helmc /usr/local/bin/helmc
42+
43+
*or*:
44+
3145
$ sudo mv $PWD/helmc /usr/local/bin/helmc
3246

3347
Check your work by running `helmc --version`:

src/quickstart/provider/aws/boot.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ guide uses AWS EC2 to boot a Kubernetes cluster using the open source provisioni
55

66
## Pre-requisites
77

8-
1. You need an active AWS account. Visit [](http://aws.amazon.com) to sign up
8+
1. You need an active AWS account. Visit [AWS portal](http://aws.amazon.com) to sign up
99
2. You need AWS API keys with full access
10-
3. Install the AWS cli tools, you can find instructions for your platform at [](https://aws.amazon.com/cli/)
10+
3. Install the AWS cli tools, you can find instructions for your platform at [AWS Command Line Interface Site](https://aws.amazon.com/cli/)
1111

1212
To verify that your CLI is configured properly, run `aws ec2 describe-regions`:
1313

1414
```
15-
$ aws ec2 describe-regions
15+
$ aws ec2 describe-regions --output=text
1616
REGIONS ec2.eu-west-1.amazonaws.com eu-west-1
1717
REGIONS ec2.ap-southeast-1.amazonaws.com ap-southeast-1
1818
REGIONS ec2.ap-southeast-2.amazonaws.com ap-southeast-2
@@ -74,6 +74,23 @@ Last, so you can easily identify instances in the AWS Console, specify an instan
7474
export INSTANCE_PREFIX=first-k8s
7575
```
7676

77+
## Setup kubectl CLI
78+
79+
Very soon, we will need to use `kubectl` to check everything is running smoothly and
80+
for that let's get it on the $PATH.
81+
82+
For Mac OS, run:
83+
84+
$ ln -fs $PWD/platforms/darwin/amd64/kubectl /usr/local/bin/kubectl
85+
86+
For Linux, use this instead:
87+
88+
$ sudo ln -fs $PWD/platforms/linux/amd64/kubectl /usr/local/bin/kubectl
89+
90+
!!! note
91+
If you are using any other architecture, you can look at the `platforms/<os>/<arch>`
92+
tree to see all the available binaries
93+
7794
## Boot Your First Cluster
7895

7996
We are now ready to boot our first Kubernetes cluster on AWS!
@@ -252,7 +269,7 @@ admin@ip-172-20-0-9:~$
252269
```
253270

254271
When you are finished with the Kubernetes cluster, you may terminate the AWS resources by running
255-
`./clusters/kube-down.sh`. If you are using a new shell environement you will need to set the environment variables we
272+
`./cluster/kube-down.sh`. If you are using a new shell environment you will need to set the environment variables we
256273
used above so `kube-down.sh` can find the right cluster.
257274

258275
You are now ready to [install Deis Workflow](install-aws.md)

src/quickstart/provider/aws/dns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ names. The website for your registrar will provide detailed instructions and pri
2828
for registering your domain name. For more information, see the following resources:
2929

3030
- To use Amazon Route 53 to register a domain name, see [Registering Domain Names Using Amazon Route 53](http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/registrar.html).
31-
- For a list of accredited registrars, see the [Accredited Registrar Directory](www.internic.net/regist.html).
31+
- For a list of accredited registrars, see the [Accredited Registrar Directory](http://www.internic.net/regist.html).
3232

3333
Next, use your DNS service, such as your domain registrar, to create a wildcard CNAME record to
3434
route queries to your load balancer. For more information, see the documentation for your DNS

src/quickstart/provider/aws/install-aws.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ Run the following command to add this repository to Helm Classic:
3737
$ helmc repo add deis https://github.com/deis/charts
3838
```
3939

40+
!!! note
41+
You need [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) installed in order to run the command above
42+
4043
## Install Deis Workflow
4144

4245
Now that you have Helm Classic installed and have added the Deis Chart Repository, install Workflow by running:

src/quickstart/provider/gke/boot.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,12 @@ Fetching cluster endpoint and auth data.
7979
kubeconfig entry generated for cluster-1.
8080
```
8181

82-
Your local `kubectl` utility should now be pointed at your new container cluster. You can verify your crednentials and local configuration by running:
82+
If you don't have `kubectl` CLI setup just yet, run this to get it available
83+
locally:
84+
85+
$ gcloud components install kubectl
86+
87+
Your local `kubectl` utility should now be pointed at your new container cluster. You can verify your credentials and local configuration by running:
8388

8489
```
8590
$ kubectl cluster-info

src/troubleshooting/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ The most common problem for this issue is the user forgetting to run `deis keys:
1919
private key to their SSH agent. To do so, run `ssh-add ~/.ssh/id_rsa` and try running
2020
`git push deis master` again.
2121

22+
If you happen get a `Could not open a connection to your authentication agent`
23+
error after trying to run `ssh-add` command above, you may need to load the SSH
24+
agent environment variables issuing the `eval "$(ssh-agent)"` command before.
25+
2226
## Other Issues
2327

2428
Running into something not detailed here? Please [open an issue][issue] or hop into

src/users/ssh-keys.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ The key's randomart image is:
2929
| . o = |
3030
| . . |
3131
+-----------------+
32+
$ ssh-add ~/.ssh/id_deis
33+
Identity added: /Users/admin/.ssh/id_deis (/Users/admin/.ssh/id_deis)
3234
```
3335

3436
## Adding and Removing SSH Keys

0 commit comments

Comments
 (0)