Skip to content

Commit 32a856c

Browse files
author
Marco Capuccini
authored
Merge pull request #20 from kubenow/feature/new-kn-cli-version
Doc updates to reflect the new version of kn-cli
2 parents 3f41544 + 29dc38a commit 32a856c

File tree

2 files changed

+38
-28
lines changed

2 files changed

+38
-28
lines changed

getting_started/bootstrap.rst

+37-25
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,15 @@ Deployment configuration
2020
~~~~~~~~~~~~~~~~~~~~~~~~
2121
First we need to initialize a deploy configuration directory by running::
2222

23-
kn init my_deployment
23+
kn init openstack my_deployment
2424

25-
The configuration directory contains a new SSH key pair for your deployments, and some `Terraform <http://terraform.io/>`_ configuration templates that we need to fill in.
25+
The configuration directory contains a new SSH key pair for your deployments, and a `Terraform <http://terraform.io/>`_ configuration template that we need to fill in.
2626

27-
Locate into ``my_deployment`` and create a ``terraform.tfvars`` configuration file, copying the OpenStack template::
27+
Locate into ``my_deployment`` :
2828

2929
cd my_deployment
30-
cp terraform.tfvars.os-template terraform.tfvars
3130

32-
In this configuration file you will need to set at least:
31+
In the configuration file ``terraform.tfvars`` you will need to set at least:
3332

3433
**Cluster configuration**
3534

@@ -90,15 +89,19 @@ Deploy KubeNow
9089
~~~~~~~~~~~~~~
9190
Once you are done with your settings you are ready deploy your cluster running::
9291

93-
kn apply openstack
92+
kn apply
9493

9594
The first time you are going to deploy it will take longer, since the KubeNow image needs to be imported. Future deployments will be considerably faster, since the image will be already present in your user space.
9695

9796
To check that your cluster is up and running you can run::
9897

9998
kn kubectl get nodes
10099

101-
As long as you are in the ``my_deployment`` directory you can use ``kubectl`` over SSH to control Kubernetes. If everything went well, now you are ready to :doc:`deploy your first application <first-app>`.
100+
As long as you are in the ``my_deployment`` directory you can use ``kubectl`` over SSH to control Kubernetes. If you want to open an interactive SSH terminal onto the master then you can use the ``kn ssh`` command::
101+
102+
kn ssh
103+
104+
If everything went well, now you are ready to :doc:`deploy your first application <first-app>`.
102105

103106
Deploy on Google Cloud (GCE)
104107
----------------------------
@@ -115,16 +118,15 @@ Deployment configuration
115118
~~~~~~~~~~~~~~~~~~~~~~~~
116119
First we need to initialize a deploy configuration directory by running::
117120

118-
kn init my_deployment
121+
kn init gce my_deployment
119122

120-
The configuration directory contains a new SSH key pair for your deployments, and some `Terraform <http://terraform.io/>`_ configuration templates that we need to fill in.
123+
The configuration directory contains a new SSH key pair for your deployments, and a `Terraform <http://terraform.io/>`_ configuration template that we need to fill in.
121124

122-
Locate into into ``my_deployment`` and create a ``terraform.tfvars`` configuration file, copying the GCE template::
125+
Locate into ``my_deployment`` :
123126

124127
cd my_deployment
125-
cp terraform.tfvars.gce-template terraform.tfvars
126128

127-
In this configuration file you will need to set at least:
129+
In the configuration file ``terraform.tfvars`` you will need to set at least:
128130

129131
**Cluster configuration**
130132

@@ -163,7 +165,11 @@ To check that your cluster is up and running you can run::
163165

164166
kn kubectl get nodes
165167

166-
As long as you are in the ``my_deployment`` directory you can use ``kubectl`` over SSH to control Kubernetes. If everything went well, now you are ready to :doc:`deploy your first application <first-app>`.
168+
As long as you are in the ``my_deployment`` directory you can use ``kubectl`` over SSH to control Kubernetes. If you want to open an interactive SSH terminal onto the master then you can use the ``kn ssh`` command::
169+
170+
kn ssh
171+
172+
If everything went well, now you are ready to :doc:`deploy your first application <first-app>`.
167173

168174
Deploy on Amazon Web Services (AWS)
169175
-----------------------------------
@@ -179,16 +185,15 @@ Deployment configuration
179185
~~~~~~~~~~~~~~~~~~~~~~~~
180186
First we need to initialize a deploy configuration directory by running::
181187

182-
kn init my_deployment
188+
kn init aws my_deployment
183189

184-
The configuration directory contains a new SSH key pair for your deployments, and some `Terraform <http://terraform.io/>`_ configuration templates that we need to fill in.
190+
The configuration directory contains a new SSH key pair for your deployments, and a `Terraform <http://terraform.io/>`_ configuration template that we need to fill in.
185191

186-
Locate into ``my_deployment`` and create a ``terraform.tfvars`` configuration file, copying the AWS template::
192+
Locate into ``my_deployment`` :
187193

188194
cd my_deployment
189-
cp terraform.tfvars.aws-template terraform.tfvars
190195

191-
In this configuration file you will need to set at least:
196+
In the configuration file ``terraform.tfvars`` you will need to set at least:
192197

193198
**Cluster configuration**
194199

@@ -223,7 +228,11 @@ To check that your cluster is up and running you can run::
223228

224229
kn kubectl get nodes
225230

226-
As long as you are in the ``my_deployment`` directory you can use ``kubectl`` over SSH to control Kubernetes. If everything went well, now you are ready to :doc:`deploy your first application <first-app>`.
231+
As long as you are in the ``my_deployment`` directory you can use ``kubectl`` over SSH to control Kubernetes. If you want to open an interactive SSH terminal onto the master then you can use the ``kn ssh`` command::
232+
233+
kn ssh
234+
235+
If everything went well, now you are ready to :doc:`deploy your first application <first-app>`.
227236

228237
Deploy on Microsoft Azure
229238
----------------------------
@@ -239,16 +248,15 @@ Deployment configuration
239248
~~~~~~~~~~~~~~~~~~~~~~~~
240249
First we need to initialize a deploy configuration directory by running::
241250

242-
kn init my_deployment
251+
kn init azure my_deployment
243252

244-
The configuration directory contains a new SSH key pair for your deployments, and some `Terraform <http://terraform.io/>`_ configuration templates that we need to fill in.
253+
The configuration directory contains a new SSH key pair for your deployments, and a `Terraform <http://terraform.io/>`_ configuration template that we need to fill in.
245254

246-
Locate into into ``my_deployment`` and create a ``terraform.tfvars`` configuration file, copying the Azure template::
255+
Locate into ``my_deployment`` :
247256

248257
cd my_deployment
249-
cp terraform.tfvars.azure-template terraform.tfvars
250258

251-
In this configuration file you will need to set at least:
259+
In the configuration file ``terraform.tfvars`` you will need to set at least:
252260

253261
**Cluster configuration**
254262

@@ -283,4 +291,8 @@ To check that your cluster is up and running you can run::
283291

284292
kn kubectl get nodes
285293

286-
As long as you are in the ``my_deployment`` directory you can use ``kubectl`` over SSH to control Kubernetes. If everything went well, now you are ready to :doc:`deploy your first application <first-app>`.
294+
As long as you are in the ``my_deployment`` directory you can use ``kubectl`` over SSH to control Kubernetes. If you want to open an interactive SSH terminal onto the master then you can use the ``kn ssh`` command::
295+
296+
kn ssh
297+
298+
If everything went well, now you are ready to :doc:`deploy your first application <first-app>`.

getting_started/clean-up.rst

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ Cloud resources are typically pay-per-use, hence it is good to release them when
55

66
To release the resources, please run::
77

8-
kn destroy <cloud-provider>
9-
10-
``<cloud-provider>`` can be "openstack", "gce", "aws" or "azure".
8+
kn destroy
119

1210
**Warning:** if you delete the cluster configuration directory (``my_deployment``) the cluster status will be lost, and you'll have to delete the resources manually.

0 commit comments

Comments
 (0)