Skip to content

Commit 772c191

Browse files
paulparkinsonRichardExleyrenagranat
authored
verrazzano/multi-cloud work (#44)
* first-round * second-set * third-push * push4 * push5 * push6 * push * push * push * push * fixes * fixes * fixes * fixes * fixes * fixes * fixes * terra optimizations * terra fixes * env.sh and fixes * docker login fix * take out vaults for now * fixes * fixes * fixes * fixes * fixes * fixes * fixes * Deploy fixes and new terraform * terraform reorg and fixes * oci_core_services fix * Update core.tf * Update core.tf * Update main-destroy.sh * fixes * Update core.tf * fixes * Update oke-setup.sh * fixes * Boost Node CPU and Memory * Rename states for clarity * Update containerengine.tf * Update main-setup.sh * Build perf and main-setup.sh restart * fix * compute shape and docker login enhancements * Update main-setup.sh * build perf tuning * build fixes * Update build-all.sh * Update oci-cli-cs-key-auth.sh * terraform 3 AD * Update oci-cli-cs-key-auth.sh * Update core.tf * fixes * Update core.tf * fixes Uncomment Internet Gateway Comment DHCP settings Move SSL creation to earlier Add wait for OKE to warm up * fixes PropSetup Back to single domain Wait for OKE nodes msdataworkshop alias cwallet.sso name change remove terraform-orig * fixes wallet.zip VM.Standard.B1.1 image Prune terraform status to 60 characters * fixes add cwallet.sso link rm wallet folder (for security) * fixes Destroy new object atp secrets wait for OKE improved logging and setup handling * minor fixes * Fixes Remove RUN_TYPE for now Execute JAVA_BUILD and NON_JAVA_BUILD from main-setup * Fixes No Key Generated messages Improve end of setup * Update containerengine.tf Change image shape * Fixes Hardening oke-setup Different Shape * Update oke-setup.sh Hardening * Parallel Destroy Make destroy run in parallel * chmod * Update main-setup.sh More hardening * Update main-setup.sh * Update oke-setup.sh More defensive code * Typo * SODA build + cleanup Replace SODA jar with maven dependency Remove old scripts Fix global deploy/undeploy scripts * Reorg Jaeger * Jaeger Fixes * DB Prep in Setup and DB Name Changes Moved DB Setup from Java to Shell Change DB Name to o and i * Fixes and Start of GB Integration * DB Name Changes * Update db-setup.sh Fixes * dotnet inventorylocation query * Update main-setup.sh * dotnet inventorylocation query * Update db-setup.sh * GB Integration and Prop Fixes * fixes * Update oci-cli-cs-key-auth.sh * Removed DB Setup from UI * Update oci-cli-cs-key-auth.sh * Dot Net and Go * Fixes * Update main-setup.sh * Manage Non-Java Builds Better * inventory-go work * Update main-destroy.sh * inventory-go work * inventory-go aq dequeue added * Build Reorg * Update main-setup.sh Reorg password collection * Update main-setup.sh Minor fixes * Minor Fixes * Binding Changes * Fixes * Remove Legacy Code Removed admin-helidon, atp-setup, Removed initContainers from deployment yamls * inventory-go working with pl/sql * Fixed inventory-helidon-se * Minor fixes * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update db-setup.sh * Update main-setup.sh * Update main-setup.sh * Update db-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update db-setup.sh * Fixes go build.sh fix * Update java-builds.sh * Update non-java-builds.sh * Update oke-setup.sh * Update oke-setup.sh * Update db-setup.sh * Update non-java-builds.sh * Update java-builds.sh * Update non-java-builds.sh * Update java-builds.sh * Update db-setup.sh * Update oke-setup.sh * Update java-builds.sh * Update non-java-builds.sh * Update java-builds.sh * Update non-java-builds.sh * Update oke-setup.sh * Simpler Approach * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh Remove API Key based authentication as bug is fixed * Update main-destroy.sh Complete API Key removal * Update destroy.sh * Fix Inventory DotNet and Go * Update logback.xml Fixed inventory-helidon-se * Update db-setup.sh Protect password in it contains case special characters * dotnet and go services: switch to polling for msgs * verrazzano/multi-cloud work * verrazzano comp files * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * polyglot inventory service mods * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work * verrazzano/multi-cloud work Co-authored-by: RichardExley <Richard.exley@oracle.com> Co-authored-by: irina granat <irina.granat@oracle.com>
1 parent ffd1805 commit 772c191

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

‎README-multicloud.md

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
2. Run `./setup-multicloud.sh` (takes ~20 minutes)
1616
- Step 1 will have put you in the appropriate `.../microservices-datadriven/grabdish` dir.
1717
- Takes CLUSTER_NAME as an argument
18-
- This will install verrazzano, deploy workshop microservices, and provide URLs for
18+
- This will install verrazzano, deploy workshop microservices, and provide URLs for the Frontend microservice and the consoles...
1919
- Grafana
2020
- Prometheus
2121
- Kibana
@@ -24,26 +24,29 @@
2424
- KeyCloak
2525
- Example output...
2626

27-
` NAMESPACE NAME CLASS HOSTS ADDRESS PORTS AGE`
28-
29-
cattle-system rancher <none> rancher.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
30-
keycloak keycloak <none> keycloak.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
31-
verrazzano-system verrazzano-ingress <none> verrazzano.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
32-
verrazzano-system vmi-system-es-ingest <none> elasticsearch.vmi.system.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
33-
verrazzano-system vmi-system-grafana <none> grafana.vmi.system.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
34-
verrazzano-system vmi-system-kibana <none> kibana.vmi.system.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
35-
verrazzano-system vmi-system-prometheus <none> prometheus.vmi.system.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
36-
verrazzano-system vmi-system-prometheus-gw <none> prometheus-gw.vmi.system.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
27+
`FrontEnd HOST is frontend-helidon-appconf.msdataworkshop.129.146.227.229.nip.io`
28+
29+
` NAMESPACE NAME CLASS HOSTS ADDRESS PORTS AGE`
30+
31+
cattle-system rancher <none> rancher.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
32+
keycloak keycloak <none> keycloak.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
33+
verrazzano-system verrazzano-ingress <none> verrazzano.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
34+
verrazzano-system vmi-system-es-ingest <none> elasticsearch.vmi.system.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
35+
verrazzano-system vmi-system-grafana <none> grafana.vmi.system.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
36+
verrazzano-system vmi-system-kibana <none> kibana.vmi.system.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
37+
verrazzano-system vmi-system-prometheus <none> prometheus.vmi.system.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
38+
verrazzano-system vmi-system-prometheus-gw <none> prometheus-gw.vmi.system.default.158.101.26.111.nip.io 158.101.26.111 80, 443 37h
3739

3840
3941
3. Do `Lab 2: Data-centric microservices walkthrough with Helidon MP` to test the app, etc.
40-
- REPLACE STEP 1 INSTRUCTION IN LAB
41-
- Instead of running `cd $GRABDISH_HOME;./deploy.sh` run `cd $GRABDISH_HOME;./deploy-multicloud.sh`
42+
- SKIP STEP 1 INSTRUCTION IN THE LAB
43+
- Step 2 (`./setup-multicloud.sh`) in this readme will have made the `./deploy-multicloud.sh` call which in turn
44+
deploys the GrabDish microservices in the Verrazzano/OAM framework and so there is no need to explicitly deploy.
4245
- Proceed with all other steps. Step 1 is the only difference.
4346

4447
4. Optionally, do labs 3, 4, and 5
4548
- Optionally do `Lab 3: Polyglot Microservices` to test with other languages such as Python, JS, .NET, and Go
46-
- Again, instead of running `cd $GRABDISH_HOME;./deploy.sh` run `cd $GRABDISH_HOME;./deploy-multicloud.sh`
49+
- Instead of running `cd $GRABDISH_HOME;./deploy.sh` run `cd $GRABDISH_HOME;./deploy-multicloud.sh`
4750
- Optionally do `Lab 4: Scaling` to show how the application can be scaled at the application and database tiers to maintain optimal performance.
4851
- The creation of the LB in Step 1 is not necessary as the gateway can be used.
4952
- Instead of running `export LB=[LB_IPADDRESS]` run `export LB=$(kubectl get gateway msdataworkshop-order-helidon-appconf-gw -n msdataworkshop -o jsonpath='{.spec.servers[0].hosts[0]}'`

‎grabdish/setup-multicloud.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ getistio
7373

7474
echo Saving the host name of the load balancer exposing the Frontend service endpoints...
7575
HOST=$(kubectl get gateway msdataworkshop-frontend-helidon-appconf-gw -n msdataworkshop -o jsonpath='{.spec.servers[0].hosts[0]}') # convention is namespace + appconf name + gw
76-
echo HOST is ${HOST}
76+
echo FrontEnd HOST is ${HOST}
7777

7878
ingresses

0 commit comments

Comments
 (0)