Updated configuration and preference chapters, and downloads odo latest and beta1. Latest is default

Author: jorgemoralespou

.bash_profile

@@ -11,6 +11,7 @@ if hash powerline-shell 2>/dev/null; then
     fi
 fi
 
+#alias odo=odo-v1.0.0-beta1
 alias odo=odo-latest
 
 complete -C /opt/app-root/bin/odo odo

.workshop/anmol

@@ -6,11 +6,16 @@ set -eo pipefail
 
 # Use odo v1.0.0-beta1
 # ----------------
-curl -kLs https://github.com/openshift/odo/releases/download/v1.0.0-beta1/odo-linux-amd64 -o /opt/app-root/bin/odo-latest
+curl -kLs https://github.com/openshift/odo/releases/download/v1.0.0-beta1/odo-linux-amd64 -o /opt/app-root/bin/odo-v1.0.0-beta1
+chmod 755 /opt/app-root/bin/odo-v1.0.0-beta1
+# ----------------
+# Also get odo latest binary built
+# ----------------
+curl -kLs https://dl.bintray.com/odo/odo/latest/linux-amd64/odo -o /opt/app-root/bin/odo-latest
 chmod 755 /opt/app-root/bin/odo-latest
 # ----------------
 
-odo utils config set UpdateNotification false
+/opt/app-root/bin/odo-latest preference set UpdateNotification false
 
 if [ x"$PROJECT_NAMESPACE" != x"" ]; then
     # TODO: Change back to view once the issue is solved

.workshop/setup

@@ -1,4 +1,4 @@
-FROM quay.io/openshiftlabs/workshop-dashboard:2.8.1
+FROM quay.io/openshiftlabs/workshop-dashboard:2.10.3
 
 RUN source /opt/workshop/etc/profile.d/python.sh && \
     pip install --no-cache-dir powerline-shell==0.7.0 && \
@@ -28,4 +28,4 @@ RUN rm Dockerfile .gitignore .dockerignore && \
 
 USER 1001
 
-ENV ODO_VERSION=0.0.17
+ENV ODO_VERSION=v1.0.0-beta1

Dockerfile

@@ -15,10 +15,10 @@ Now although the intent is to show as much as possible of what `odo` can do, bec
 If you were using `odo` with your own cluster, you could log in to the cluster by using:
 
 ```bash
-odo login
+odo login <CLUSTER_URL>
 ```
 
-The command will interactively prompt you for details of the cluster. Alternatively you could supply the address of the OpenShift cluster as an argument.
+The command will interactively prompt you for details of the user.
 
 ### Projects
 
@@ -36,67 +36,4 @@ odo project --help
 
 The `--help` option can be used on any `odo` command to see more details about what it can do.
 
-Since we already have a project created for us, we are good to go though, and do not need to create one.
-
-## Component configuration and global preferences
-
-There are a couple other commands you can run to view component configuration and `odo` preferences that are global.
-
-Run this command to view the values for global `odo` preferences:
-
-```execute-1
-odo preference view
-```
-
-The preference parameters are defined as follows:
-
-
-**NamePrefix** - Default prefix is the current directory name. Use this value to set a default name prefix
-
-**Timeout** - Timeout (in seconds) for OpenShift server connection check
-
-**UpdateNotification** - Controls if an update notification is shown or not (true or false)
-
-
-To view the current component configuration, run this command:
-
-```execute-1
-odo config view
-```
-
-The component configuration parameters are defined as follows:
-
-
-**Application** - Application is the name of application the component needs to be part of
-
-**CPU** - The minimum and maximum CPU a component can consume
-
-**Ignore** - Consider the .odoignore file for push and watch
-
-**MaxCPU** - The maximum CPU a component can consume
-
-**MaxMemory** - The maximum memory a component can consume
-
-**Memory** - The minimum and maximum memory a component can consume
-
-**MinCPU** - The minimum CPU a component can consume
-
-**MinMemory** - The minimum memory a component is provided
-
-**Name** - The name of the component
-
-**Ports** - Ports to be opened in the component
-
-**Project** - Project is the name of the project the component is part of
-
-**Ref** - Git ref to use for creating component from git source
-
-**SourceLocation** - The path indicates the location of binary file or git source
-
-**SourceType** - Type of component source - git/binary/local
-
-**Type** - The type of component
-
-**Url** - URL to access the component
-
-
+Since we already have a project created for us, we are good to go though, and do not need to create one.

workshop/content/040-overview.md

@@ -1,7 +1,7 @@
 ---
 Title: Creating a new binary component
 PrevPage: 050-creating-an-application
-NextPage: 061-exposing-components-to-public
+NextPage: 062-component-configuration
 ---
 
 A selection of runtimes, frameworks, and other components is available on an OpenShift cluster for building your applications.
@@ -59,7 +59,7 @@ odo create java frontend --binary target/parksmap-web.jar --app parksmap
 Please use `odo push` command to create the component with source deployed
 ```
 
-What does it mean for ``odo`` to create the configuration for a component? Let's take a look. 
+What does it mean for ``odo`` to create the configuration for a component? Let's take a look.
 
 ```execute-1
 ls -al .odo
@@ -91,7 +91,7 @@ To view this in a more human-readable way, run:
 odo config view
 ```
 
-While we have this configuration defined, the application is not yet deployed on OpenShift.
+While we have this configuration defined, the application is not yet deployed on OpenShift. We will learn in the next lab more about the component's configuration.
 
 When we run `odo push`, a container will be created with the Java application server and then, since this is a binary component, your JAR file will be pushed to that container.
 
@@ -120,41 +120,4 @@ When the push completes, ``odo`` will display output similar to:
  ✓  Changes successfully pushed to component: frontend
 ```
 
-## Component configuration
-When creating a component, some configuration will be inherited by default, but there is a way to override these defaults.
-
-An example is the memory and cpu for your component. When deploying components in an OpenShift platform, ``odo`` will not impose any configuration for cpu and memory, but sometimes the platform does impose some values for the minimum and maximum cpu and memory a deployment can have.
-
-If you want to explicitly set these values, you could have done before:
-
-```
-odo create java frontend \
-    --binary target/parksmap-web.jar \
-    --app parksmap \
-    --memory 1Gi \
-    --cpu 1
-```
-
-This will guarantee that your component will be created requesting 1 GB of memory as minimum and maximum and 1 CPU as minimum and maximum.
-
-If you want your component to get some minimum values and grow if needed, you could also have done:
-
-```
-odo create java frontend \
-    --binary target/parksmap-web.jar \
-    --app parksmap \
-    --min-memory 512Mi \
-    --max-memory 1Gi \
-    --min-cpu 0.5 \
-    --max-cpu 1
-```
-
-You can also set environment variables for your component at creation time. These will be passed to your component and you will be able to use them within your application's code.
-
-```
-odo create java frontend --binary target/parksmap-web.jar \
-    --app parksmap \
-    --env DEBUG=true
-```
-
-Now that you've created the `frontend` component for the application and pushed it to your OpenShift cluster, let's look at how you can access the application frontend.
+Now that you've created the `frontend` component for the application and pushed it to your OpenShift cluster, let's look at how you can access the application frontend. But before we do that, it's time to do a little break to introduce you better to odo configuration.

workshop/content/060-creating-new-binary-component.md

@@ -0,0 +1,91 @@
+---
+Title: Component configuration
+PrevPage: 060-creating-new-binary-component
+NextPage: 065-exposing-components-to-public
+---
+
+When creating a component, some configuration will be inherited by default, but there is a way to override these defaults.
+
+An example is the memory and cpu for your component. When deploying components in an OpenShift platform, ``odo`` will not impose any configuration for cpu and memory, but sometimes the platform does impose some values for the minimum and maximum cpu and memory a deployment can have.
+
+If you want to explicitly set these values, you could have done before:
+
+```
+odo create java frontend \
+    --binary target/parksmap-web.jar \
+    --app parksmap \
+    --memory 1Gi \
+    --cpu 1
+```
+
+This will guarantee that your component will be created requesting 1 GB of memory as minimum and maximum and 1 CPU as minimum and maximum.
+
+If you want your component to get some minimum values and grow if needed, you could also have done:
+
+```
+odo create java frontend \
+    --binary target/parksmap-web.jar \
+    --app parksmap \
+    --min-memory 512Mi \
+    --max-memory 1Gi \
+    --min-cpu 0.5 \
+    --max-cpu 1
+```
+
+You can also set environment variables for your component at creation time. These will be passed to your component and you will be able to use them within your application's code.
+
+```
+odo create java frontend --binary target/parksmap-web.jar \
+    --app parksmap \
+    --env DEBUG=true
+```
+
+Odo, like git, stores it's configuration on a local folder `.odo`. As we have seen, we can see the component's configuration easily:
+
+```execute-1
+odo config view
+```
+
+The component configuration parameters are defined as follows:
+
+* **Application** - Application is the name of application the component needs to be part of
+* **CPU** - The minimum and maximum CPU a component can consume
+* **Ignore** - Consider the .odoignore file for push and watch
+* **MaxCPU** - The maximum CPU a component can consume
+* **MaxMemory** - The maximum memory a component can consume
+* **Memory** - The minimum and maximum memory a component can consume
+* **MinCPU** - The minimum CPU a component can consume
+* **MinMemory** - The minimum memory a component is provided
+* **Name** - The name of the component
+* **Ports** - Ports to be opened in the component
+* **Project** - Project is the name of the project the component is part of
+* **Ref** - Git ref to use for creating component from git source
+* **SourceLocation** - The path indicates the location of binary file or git source
+* **SourceType** - Type of component source - git/binary/local
+* **Type** - The type of component
+* **Url** - URL to access the component
+
+More will come as odo evolves.
+
+But not only you can set predefined configuration, which will affect how your application will be deployed. When your application needs some configuration, this is the same mechanism to configure it.
+
+Let's add a configuration to our current component:
+
+```execute-1
+odo config set --env DEV_MODE=true
+```
+
+We can now see the new configuration defined at the top of the output as `Environment variables`:
+
+```execute-1
+odo config view
+```
+
+One thing that you can now think is that, if we have a component already configured in Version Control with odo configuration in place, we can easily deploy the component in one step:
+
+```
+git clone <COMPONENT_GIT_URL>
+odo push
+```
+
+Soon you'll find many projects with odo configuration in place. For you to work with these applications you will only need to execute a simple command. Isn't that cool!!!

workshop/content/062-component-configuration.md

@@ -1,6 +1,6 @@
 ---
 Title: Exposing components to public
-PrevPage: 060-creating-new-binary-component
+PrevPage: 062-component-configuration
 NextPage: 070-deploying-component-from-source-code
 ---
 
@@ -13,7 +13,7 @@ odo url create frontend --port 8080
 Similar to when we create a component, creating a URL sets that information in the component configuration, but it doesn't get applied to your OpenShift cluster until you run `odo push`.
 
 ```execute-1
-odo push
+odo push --show-log
 ```
 
 Watch the logs and wait until the component is ready.

…ent/061-exposing-components-to-public.md …ent/065-exposing-components-to-public.mdworkshop/content/061-exposing-components-to-public.md renamed to workshop/content/065-exposing-components-to-public.md workshop/content/061-exposing-components-to-public.md renamed to workshop/content/065-exposing-components-to-public.md

@@ -1,6 +1,6 @@
 ---
 Title: Deploying component from source code
-PrevPage: 061-exposing-components-to-public
+PrevPage: 065-exposing-components-to-public
 NextPage: 075-create-a-service
 ---
 

workshop/content/070-deploying-component-from-source-code.md

@@ -1,7 +1,7 @@
 ---
 Title: Installing odo
 PrevPage: 105-whats-next
-NextPage: 120-finish
+NextPage: 115-odo-preferences
 ---
 
 The `odo` tool is a single executable written in the Go