diff --git a/README.md b/README.md index e346264..8ca2258 100644 --- a/README.md +++ b/README.md @@ -32,11 +32,11 @@ To create an *application*, you must first create a new *project*, which will co 1. From your browser, visit the OpenShift web console at *https://:8443*. The web site, uses a self-signed certificate, so if prompted, continue and ignore the browser warning. -![](./img/image3.jpg) +![](./img/image3.png) 1. Log in using your username and password. -![](./img/image4.jpg) +![](./img/image4.png) 1. To create a new project, click on blue *Create Project* button. @@ -46,7 +46,7 @@ so if prompted, continue and ignore the browser warning. 1. Click on the project name in right column and examine your fresh project. -![](./img/image5.jpg) +![](./img/image5.png) CHALLENGE 2: Create and manage Applications @@ -89,7 +89,7 @@ oc new-app https://github.com/$USER/Kubernetes2OpenShift --context-dir=bookshop When build is finished it should look like: -![](./img/image10.jpg) +![](./img/image10.png) OpenShift leverages the Kubernetes concept of a pod, which is one or more containers deployed together on one host. A pod is the smallest compute unit that can be defined, deployed, and managed. @@ -108,16 +108,16 @@ oc expose svc/bookshop 1. From the overview page, click the web address for the application in the upper right corner. Verify that the web application is up and available. -![](./img/image11.jpg) +![](./img/image11.png) 1. Return to the *OpenShift* admin console. Browse to the project's overview page, and test scaling out and in your application by increasing or decreasing the number of *pods*, using the up and down arrow signs on the web console. Scale out the app into 3 pods and watch the progress. -![](./img/image12.jpg) +![](./img/image12.png) 1. Browse to Applications -> Pods, and make sure 3 pods serving the same application are now up and running. -![](./img/image13.jpg) +![](./img/image13.png) 1. Scale Application back to 1 Pod @@ -137,7 +137,7 @@ To set up a *webhook* for your application: 1. Click next to GitHub webhook URL to copy your *webhook* payload URL. -![](./img/image14.jpg) +![](./img/image14.png) 1. Navigate to your forked repository on GitHub, then click Settings. @@ -149,7 +149,7 @@ To set up a *webhook* for your application: 1. Disable SSL verification and click Add webhook to save. -![](./img/image15.jpg) +![](./img/image15.png) 1. Keep all the other parameters with the default values. @@ -157,7 +157,7 @@ GitHub will now attempt to send a ping payload to your *OpenShift* server to ens Hover your mouse over the check mark to see the status of the last delivery. -![](./img/image16.jpg) +![](./img/image16.png) Next time you push a code change to your forked repository, your application will automatically rebuild. @@ -169,7 +169,7 @@ In this section, we demonstrate one of the most powerful features of *OpenShift* Once there is a code change, the Github *webhook* will trigger the build of a new container image that combines a blueprint image from the registry with the updated code and generate a new image. This feature is called *S2I*, or source to image. Once the build finishes, *OpenShift* will automatically deploy the new application based on the new image. This capability enables multiple deployment strategies such as A/B testing, Rolling upgrades... -![](./img/image17.jpg) +![](./img/image17.png) 1. Use Azure cloud shell or install *Git* into your local machine @@ -222,14 +222,14 @@ For example: on line 215, change the title to "Welcome to your Django applicatio Now going forward, all you need to do is push code updates and OpenShift handles the rest. 1. In an *Overview* view you can see your deployment beeing updated. -![](./img/image19.jpg) +![](./img/image19.png) 1. In *Build->Build* view you can see details of your webhook build. -![](./img/image18.jpg) +![](./img/image18.png) 1. From the web browser refresh the page and note the new change -![](./img/image20.jpg) +![](./img/image20.png) 1. You may find it useful to manually rebuild an image if your *webhook* is not working, or if a build fails and you do not want to change the code before restarting the build. To manually rebuild the image based on your latest committed change to your forked repository: diff --git a/img/image10.jpg b/img/image10.jpg deleted file mode 100644 index e644b1a..0000000 Binary files a/img/image10.jpg and /dev/null differ diff --git a/img/image10.png b/img/image10.png new file mode 100644 index 0000000..67dfcf3 Binary files /dev/null and b/img/image10.png differ diff --git a/img/image11.jpg b/img/image11.jpg deleted file mode 100644 index cdcf44b..0000000 Binary files a/img/image11.jpg and /dev/null differ diff --git a/img/image12.jpg b/img/image12.jpg deleted file mode 100644 index f327741..0000000 Binary files a/img/image12.jpg and /dev/null differ diff --git a/img/image12.png b/img/image12.png new file mode 100644 index 0000000..49ad857 Binary files /dev/null and b/img/image12.png differ diff --git a/img/image13.jpg b/img/image13.jpg deleted file mode 100644 index 11937fb..0000000 Binary files a/img/image13.jpg and /dev/null differ diff --git a/img/image13.png b/img/image13.png new file mode 100644 index 0000000..79f3aae Binary files /dev/null and b/img/image13.png differ diff --git a/img/image14.jpg b/img/image14.jpg deleted file mode 100644 index 506c011..0000000 Binary files a/img/image14.jpg and /dev/null differ diff --git a/img/image14.png b/img/image14.png new file mode 100644 index 0000000..db1f7e9 Binary files /dev/null and b/img/image14.png differ diff --git a/img/image15.jpg b/img/image15.jpg deleted file mode 100644 index 222c065..0000000 Binary files a/img/image15.jpg and /dev/null differ diff --git a/img/image15.png b/img/image15.png new file mode 100644 index 0000000..4277e62 Binary files /dev/null and b/img/image15.png differ diff --git a/img/image16.jpg b/img/image16.png similarity index 100% rename from img/image16.jpg rename to img/image16.png diff --git a/img/image17.jpg b/img/image17.png similarity index 100% rename from img/image17.jpg rename to img/image17.png diff --git a/img/image18.jpg b/img/image18.jpg deleted file mode 100644 index 32a2c66..0000000 Binary files a/img/image18.jpg and /dev/null differ diff --git a/img/image18.png b/img/image18.png new file mode 100644 index 0000000..78d4060 Binary files /dev/null and b/img/image18.png differ diff --git a/img/image19.jpg b/img/image19.jpg deleted file mode 100644 index 63177ce..0000000 Binary files a/img/image19.jpg and /dev/null differ diff --git a/img/image19.png b/img/image19.png new file mode 100644 index 0000000..25c003b Binary files /dev/null and b/img/image19.png differ diff --git a/img/image2.jpg b/img/image2.png similarity index 100% rename from img/image2.jpg rename to img/image2.png diff --git a/img/image20.jpg b/img/image20.jpg deleted file mode 100644 index 0661c35..0000000 Binary files a/img/image20.jpg and /dev/null differ diff --git a/img/image21.jpg b/img/image21.jpg deleted file mode 100644 index 694f7d8..0000000 Binary files a/img/image21.jpg and /dev/null differ diff --git a/img/image22.jpg b/img/image22.jpg deleted file mode 100644 index e4a3e47..0000000 Binary files a/img/image22.jpg and /dev/null differ diff --git a/img/image23.jpg b/img/image23.jpg deleted file mode 100644 index c008001..0000000 Binary files a/img/image23.jpg and /dev/null differ diff --git a/img/image24.jpg b/img/image24.jpg deleted file mode 100644 index 4b2c706..0000000 Binary files a/img/image24.jpg and /dev/null differ diff --git a/img/image25.jpg b/img/image25.jpg deleted file mode 100644 index 8d1226e..0000000 Binary files a/img/image25.jpg and /dev/null differ diff --git a/img/image26.jpg b/img/image26.jpg deleted file mode 100644 index a657ee7..0000000 Binary files a/img/image26.jpg and /dev/null differ diff --git a/img/image27.jpg b/img/image27.jpg deleted file mode 100644 index 8c91987..0000000 Binary files a/img/image27.jpg and /dev/null differ diff --git a/img/image28.jpg b/img/image28.jpg deleted file mode 100644 index c430558..0000000 Binary files a/img/image28.jpg and /dev/null differ diff --git a/img/image29.jpg b/img/image29.jpg deleted file mode 100644 index 8d3db01..0000000 Binary files a/img/image29.jpg and /dev/null differ diff --git a/img/image3.jpg b/img/image3.png similarity index 100% rename from img/image3.jpg rename to img/image3.png diff --git a/img/image4.jpg b/img/image4.png similarity index 100% rename from img/image4.jpg rename to img/image4.png diff --git a/img/image5.jpg b/img/image5.png similarity index 100% rename from img/image5.jpg rename to img/image5.png diff --git a/img/image6.jpg b/img/image6.jpg deleted file mode 100644 index 7e45df1..0000000 Binary files a/img/image6.jpg and /dev/null differ diff --git a/img/image7.jpg b/img/image7.jpg deleted file mode 100644 index d7b24a0..0000000 Binary files a/img/image7.jpg and /dev/null differ diff --git a/img/image8.jpg b/img/image8.jpg deleted file mode 100644 index 3e977ba..0000000 Binary files a/img/image8.jpg and /dev/null differ diff --git a/img/image9.jpg b/img/image9.jpg deleted file mode 100644 index e362223..0000000 Binary files a/img/image9.jpg and /dev/null differ