@@ -553,7 +553,7 @@ <h1>Helloworld-MSA (Microservices architecture)</h1>
553553<ul class="sectlevel1">
554554<li><a href="#_prepare_environment">Prepare Environment</a>
555555<ul class="sectlevel2">
556- <li><a href="#_option_1_use_minishift_openshift_3_9 ">(Option 1) Use minishift (OpenShift 3.9 )</a>
556+ <li><a href="#_option_1_use_minishift_openshift_3_11 ">(Option 1) Use minishift (OpenShift 3.11 )</a>
557557<ul class="sectlevel3">
558558<li><a href="#_access_openshift_console">Access Openshift console</a></li>
559559</ul>
@@ -684,7 +684,7 @@ <h2 id="_prepare_environment">Prepare Environment</h2>
684684<p>If you don’t have an OpenShift instance running, we strongly suggest that you use minishift</p>
685685</div>
686686<div class="sect2">
687- <h3 id="_option_1_use_minishift_openshift_3_9 ">(Option 1) Use minishift (OpenShift 3.9 )</h3>
687+ <h3 id="_option_1_use_minishift_openshift_3_11 ">(Option 1) Use minishift (OpenShift 3.11 )</h3>
688688<div class="paragraph">
689689<p>Download Minishift from <a href="https://github.com/minishift/minishift/releases">minishift</a>.</p>
690690</div>
@@ -696,6 +696,8 @@ <h3 id="_option_1_use_minishift_openshift_3_9">(Option 1) Use minishift (OpenShi
696696<pre>$ minishift profile set msa-tutorial
697697$ minishift config set memory 8GB
698698$ minishift config set cpus 3
699+ $ minishift config set image-caching true
700+ $ minishift config set openshift-version v3.11.0
699701$ minishift addons enable anyuid
700702$ minishift addons enable admin-user
701703$ minishift start
@@ -879,7 +881,7 @@ <h5 id="_basic_project_creation_2">Basic project creation</h5>
879881<h5 id="_enable_jolokia_and_readiness_probe">Enable Jolokia and Readiness probe</h5>
880882<div class="listingblock">
881883<div class="content">
882- <pre>$ oc env dc/aloha AB_ENABLED=jolokia; oc patch dc/aloha -p '{"spec":{"template":{"spec":{"containers":[{"name":"aloha","ports":[{"containerPort": 8778,"name":"jolokia"}]}]}}}}'
884+ <pre>$ oc set env dc/aloha AB_ENABLED=jolokia; oc patch dc/aloha -p '{"spec":{"template":{"spec":{"containers":[{"name":"aloha","ports":[{"containerPort": 8778,"name":"jolokia"}]}]}}}}'
883885$ oc set probe dc/aloha --readiness --get-url=http://:8080/api/health</pre>
884886</div>
885887</div>
@@ -923,7 +925,7 @@ <h5 id="_basic_project_creation_3">Basic project creation</h5>
923925<h5 id="_enable_jolokia_and_readiness_probe_2">Enable Jolokia and Readiness probe</h5>
924926<div class="listingblock">
925927<div class="content">
926- <pre>$ oc env dc/ola AB_ENABLED=jolokia; oc patch dc/ola -p '{"spec":{"template":{"spec":{"containers":[{"name":"ola","ports":[{"containerPort": 8778,"name":"jolokia"}]}]}}}}'
928+ <pre>$ oc set env dc/ola AB_ENABLED=jolokia; oc patch dc/ola -p '{"spec":{"template":{"spec":{"containers":[{"name":"ola","ports":[{"containerPort": 8778,"name":"jolokia"}]}]}}}}'
927929$ oc set probe dc/ola --readiness --get-url=http://:8080/api/health</pre>
928930</div>
929931</div>
@@ -1008,7 +1010,7 @@ <h5 id="_basic_project_creation_5">Basic project creation</h5>
10081010<h5 id="_enable_jolokia_and_readiness_probe_3">Enable Jolokia and Readiness probe</h5>
10091011<div class="listingblock">
10101012<div class="content">
1011- <pre>$ oc env dc/api-gateway AB_ENABLED=jolokia; oc patch dc/api-gateway -p '{"spec":{"template":{"spec":{"containers":[{"name":"api-gateway","ports":[{"containerPort": 8778,"name":"jolokia"}]}]}}}}'
1013+ <pre>$ oc set env dc/api-gateway AB_ENABLED=jolokia; oc patch dc/api-gateway -p '{"spec":{"template":{"spec":{"containers":[{"name":"api-gateway","ports":[{"containerPort": 8778,"name":"jolokia"}]}]}}}}'
10121014$ oc set probe dc/api-gateway --readiness --get-url=http://:8080/health</pre>
10131015</div>
10141016</div>
@@ -1060,13 +1062,13 @@ <h5 id="_basic_project_creation_6">Basic project creation</h5>
10601062<h5 id="_specify_the_openshift_domain">Specify the OpenShift domain</h5>
10611063<div class="listingblock">
10621064<div class="content">
1063- <pre>$ oc env dc/frontend OS_SUBDOMAIN=<OPENSHIFT-DOMAIN>
1065+ <pre>$ oc set env dc/frontend OS_SUBDOMAIN=<OPENSHIFT-DOMAIN>
10641066
10651067# Using CDK
1066- $ oc env dc/frontend OS_SUBDOMAIN=`minishift ip`.nip.io
1068+ $ oc set env dc/frontend OS_SUBDOMAIN=`minishift ip`.nip.io
10671069
10681070# Example: OS_SUBDOMAIN=192.168.64.11.nip.io
1069- $ oc env dc/frontend OS_SUBDOMAIN=192.168.64.11.nip.io</pre>
1071+ $ oc set env dc/frontend OS_SUBDOMAIN=192.168.64.11.nip.io</pre>
10701072</div>
10711073</div>
10721074</div>
@@ -1129,7 +1131,7 @@ <h4 id="_enable_the_hystrix_dashboard_in_the_frontend">Enable the Hystrix Dashbo
11291131</div>
11301132<div class="listingblock">
11311133<div class="content">
1132- <pre>$ oc env dc/frontend ENABLE_HYSTRIX=true</pre>
1134+ <pre>$ oc set env dc/frontend ENABLE_HYSTRIX=true</pre>
11331135</div>
11341136</div>
11351137</div>
@@ -1173,7 +1175,7 @@ <h4 id="_deploy_using_oc_cli_2">Deploy using oc CLI</h4>
11731175<div class="listingblock">
11741176<div class="content">
11751177<pre>$ oc process -f https://raw.githubusercontent.com/jaegertracing/jaeger-openshift/0.1.2/all-in-one/jaeger-all-in-one-template.yml | oc create -f -
1176- $ oc env dc -l app JAEGER_SERVER_HOSTNAME=jaeger-all-in-one # redeploy all services with tracing</pre>
1178+ $ oc set env dc -l app JAEGER_SERVER_HOSTNAME=jaeger-all-in-one # redeploy all services with tracing</pre>
11771179</div>
11781180</div>
11791181</div>
@@ -1184,7 +1186,7 @@ <h4 id="_enable_the_jaeger_dashboard_in_the_frontend">Enable the Jaeger Dashboar
11841186</div>
11851187<div class="listingblock">
11861188<div class="content">
1187- <pre>$ oc env dc/frontend ENABLE_JAEGER=true</pre>
1189+ <pre>$ oc set env dc/frontend ENABLE_JAEGER=true</pre>
11881190</div>
11891191</div>
11901192</div>
@@ -1243,13 +1245,13 @@ <h5 id="_optional_enable_readiness_probe_2">(Optional) Enable Readiness probe</h
12431245<h5 id="_specify_the_openshift_domain_2">Specify the OpenShift domain</h5>
12441246<div class="listingblock">
12451247<div class="content">
1246- <pre>$ oc env dc/keycloak OS_SUBDOMAIN=<OPENSHIFT-DOMAIN>
1248+ <pre>$ oc set env dc/keycloak OS_SUBDOMAIN=<OPENSHIFT-DOMAIN>
12471249
12481250#Using CDK3
1249- $ oc env dc/keycloak OS_SUBDOMAIN=app.$(minishift ip).nip.io
1251+ $ oc set env dc/keycloak OS_SUBDOMAIN=app.$(minishift ip).nip.io
12501252
12511253#Example: OS_SUBDOMAIN=app.192.168.64.11.nip.io
1252- $ oc env dc/keycloak OS_SUBDOMAIN=app.192.168.64.11.nip.io</pre>
1254+ $ oc set env dc/keycloak OS_SUBDOMAIN=app.192.168.64.11.nip.io</pre>
12531255</div>
12541256</div>
12551257</div>
@@ -1261,12 +1263,12 @@ <h4 id="_tell_microservices_where_to_find_the_keycloak_server">Tell microservice
12611263<pre>$ oc project helloworld-msa
12621264
12631265# Using CDK3
1264- $ oc env dc KEYCLOAK_AUTH_SERVER_URL=http://keycloak-sso.`minishift ip`.nip.io/auth -l app
1266+ $ oc set env dc KEYCLOAK_AUTH_SERVER_URL=http://keycloak-sso.`minishift ip`.nip.io/auth -l app
12651267
12661268# Example: OS_SUBDOMAIN=192.168.64.11.nip.io
1267- $ oc env dc KEYCLOAK_AUTH_SERVER_URL=http://keycloak-sso.192.168.64.11.nip.io/auth -l app
1269+ $ oc set env dc KEYCLOAK_AUTH_SERVER_URL=http://keycloak-sso.192.168.64.11.nip.io/auth -l app
12681270
1269- $ oc env dc/frontend ENABLE_SSO=true</pre>
1271+ $ oc set env dc/frontend ENABLE_SSO=true</pre>
12701272</div>
12711273</div>
12721274</div>
@@ -1295,13 +1297,13 @@ <h4 id="_create_a_custom_api_management_build">Create a custom API Management bu
12951297<h5 id="_specify_the_openshift_domain_3">Specify the OpenShift domain</h5>
12961298<div class="listingblock">
12971299<div class="content">
1298- <pre>$ oc env bc/api-management OS_SUBDOMAIN=<OPENSHIFT-DOMAIN>
1300+ <pre>$ oc set env bc/api-management OS_SUBDOMAIN=<OPENSHIFT-DOMAIN>
12991301
13001302#Using CDK3
1301- $ oc env bc/api-management OS_SUBDOMAIN=$(minishift ip).nip.io
1303+ $ oc set env bc/api-management OS_SUBDOMAIN=$(minishift ip).nip.io
13021304
13031305#Example: OS_SUBDOMAIN=192.168.64.11.nip.io
1304- $ oc env bc/api-management OS_SUBDOMAIN=192.168.64.11.nip.io</pre>
1306+ $ oc set env bc/api-management OS_SUBDOMAIN=192.168.64.11.nip.io</pre>
13051307</div>
13061308</div>
13071309</div>
@@ -1331,7 +1333,7 @@ <h5 id="_optional_enable_readiness_probe_3">(Optional) Enable Readiness probe</h
13311333<h4 id="_tell_frontend_to_enable_api_management">Tell frontend to enable API Management</h4>
13321334<div class="listingblock">
13331335<div class="content">
1334- <pre>$ oc env dc/frontend ENABLE_THREESCALE=true</pre>
1336+ <pre>$ oc set env dc/frontend ENABLE_THREESCALE=true</pre>
13351337</div>
13361338</div>
13371339</div>
@@ -1398,10 +1400,10 @@ <h3 id="_environment_variables">Environment variables</h3>
13981400</div>
13991401<div class="listingblock">
14001402<div class="content">
1401- <pre>$ oc env dc/hola hello="Hola de Env var"
1403+ <pre>$ oc set env dc/hola hello="Hola de Env var"
14021404
14031405# To unset the env var
1404- $ oc env dc/hola hello-</pre>
1406+ $ oc set env dc/hola hello-</pre>
14051407</div>
14061408</div>
14071409</div>
@@ -1438,7 +1440,7 @@ <h4 id="_update_the_microservice_to_read_the_file">Update the microservice to re
14381440</div>
14391441<div class="listingblock">
14401442<div class="content">
1441- <pre>$ oc env dc/hola JAVA_OPTIONS="-Dconf=/etc/config/translation.properties"</pre>
1443+ <pre>$ oc set env dc/hola JAVA_OPTIONS="-Dconf=/etc/config/translation.properties"</pre>
14421444</div>
14431445</div>
14441446<div class="paragraph">
@@ -1852,10 +1854,10 @@ <h3 id="_running_in_the_cloud">Running in the cloud</h3>
18521854</div>
18531855<div class="listingblock">
18541856<div class="content">
1855- <pre>$ oc env dc/frontend OS_SUBDOMAIN=app.redhatmsa.com
1857+ <pre>$ oc set env dc/frontend OS_SUBDOMAIN=app.redhatmsa.com
18561858
18571859# If you deployed SSO/keycloak
1858- $ oc env dc/keycloak --namespace=sso OS_SUBDOMAIN=app.redhatmsa.com</pre>
1860+ $ oc set env dc/keycloak --namespace=sso OS_SUBDOMAIN=app.redhatmsa.com</pre>
18591861</div>
18601862</div>
18611863</div>
0 commit comments