Skip to content

Commit eb988fe

Browse files
paulparkinsonRichardExleyrenagranat
authored
v8o/multicloud app.yaml etc. mods (#36)
* 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 Co-authored-by: RichardExley <Richard.exley@oracle.com> Co-authored-by: irina granat <irina.granat@oracle.com>
1 parent ffb0869 commit eb988fe

File tree

11 files changed

+114
-69
lines changed

11 files changed

+114
-69
lines changed

‎README-multicloud.md

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,50 @@
1+
# Mutli-cloud, Verrazzano version of workshop
2+
#Simplify microservices architecture with Oracle Converged Database
13

2-
1. Do lab 1
3-
2. Run ./setup-multicloud.sh
4-
3. Do lab 2 and 3 which tests the app, etc.
5-
4. Use URLs and login from output in step 2 to look at Grafana, etc.
4+
0. Starting from http://bit.ly/simplifymicroservices
5+
6+
1. Do `Lab 1: Setup`
7+
- This will clone the workshop src from https://github.com/oracle/microservices-datadriven
8+
and provision and configure the following
9+
- OKE cluster
10+
- 2 ATP databases (with secrets, AQ propagation, etc.)
11+
- OCIR
12+
- Object Storage
13+
14+
2. Run `./setup-multicloud.sh` (step 1 will have put you in the appropriate `.../microservices-datadriven/grabdish` dir)
15+
- This will install verrazzano and provide URLs for
16+
- Grafana
17+
- Prometheus
18+
- Kibana
19+
- Elasticsearch
20+
- Rancher
21+
- KeyCloak
22+
- For example...
23+
NAMESPACE NAME CLASS HOSTS ADDRESS PORTS AGE
24+
cattle-system rancher <none> rancher.default.158.101.26.244.nip.io 158.101.26.244 80, 443 37h
25+
keycloak keycloak <none> keycloak.default.158.101.26.244.nip.io 158.101.26.244 80, 443 37h
26+
verrazzano-system verrazzano-ingress <none> verrazzano.default.158.101.26.244.nip.io 158.101.26.244 80, 443 37h
27+
verrazzano-system vmi-system-es-ingest <none> elasticsearch.vmi.system.default.158.101.26.244.nip.io 158.101.26.244 80, 443 37h
28+
verrazzano-system vmi-system-grafana <none> grafana.vmi.system.default.158.101.26.244.nip.io 158.101.26.244 80, 443 37h
29+
verrazzano-system vmi-system-kibana <none> kibana.vmi.system.default.158.101.26.244.nip.io 158.101.26.244 80, 443 37h
30+
verrazzano-system vmi-system-prometheus <none> prometheus.vmi.system.default.158.101.26.244.nip.io 158.101.26.244 80, 443 37h
31+
verrazzano-system vmi-system-prometheus-gw <none> prometheus-gw.vmi.system.default.158.101.26.244.nip.io 158.101.26.244 80, 443 37h
32+
33+
3. Do `Lab 2: Data-centric microservices walkthrough with Helidon MP` to test the app, etc.
34+
- REPLACE STEP 1 INSTRUCTION IN LAB
35+
- Instead of running `cd $GRABDISH_HOME;./deploy.sh` run `cd $GRABDISH_HOME;./deploy-multicloud.sh`
36+
- Proceed with all other steps. Step 1 is the only difference.
37+
38+
4. Optionally, do labs 3, 4, and 5
39+
- Optionally do `Lab 3: Polyglot Microservices` to test with other languages such as Python, JS, .NET, and Go
40+
- Instead of running `cd $GRABDISH_HOME;./deploy.sh` run `cd $GRABDISH_HOME;./deploy-multicloud.sh`
41+
- Optionally do `Lab 4: Scaling` to show how the application can be scaled at the application and database tiers to maintain optimal performance.
42+
- Can be run without modification
43+
- Optionally do `Lab 5: Tracing Using Jaeger` to show microservice activity using OpenTracing and Jaeger.
44+
- Can be run without modification
45+
46+
4. Use https URLs and login from output in step 2 to view various dashboards.
47+
48+
TODO add walkthrough of consoles...
49+
50+
Future: Running on other clouds starting with Azure (using interconnect, etc.)...

‎grabdish/frontend-helidon/frontend-helidon-app.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
apiVersion: core.oam.dev/v1alpha2
44
kind: ApplicationConfiguration
55
metadata:
6-
name: order-helidon-appconf
6+
name: frontend-helidon-appconf
77
namespace: msdataworkshop
88
annotations:
99
version: v1.0.0
10-
description: "Order Helidon application"
10+
description: "FrontEnd Helidon application"
1111
spec:
1212
components:
13-
- componentName: order-helidon-component
13+
- componentName: frontend-helidon-component
1414
traits:
1515
- trait:
1616
apiVersion: oam.verrazzano.io/v1alpha1
1717
kind: MetricsTrait
1818
spec:
1919
scraper: verrazzano-system/vmi-system-prometheus-0
20-
# - trait:
21-
# apiVersion: oam.verrazzano.io/v1alpha1
22-
# kind: IngressTrait
23-
# metadata:
24-
# name: order-helidon-ingress
25-
# spec:
26-
# rules:
27-
# - paths:
28-
# - path: "/command"
29-
# pathType: Prefix
20+
- trait:
21+
apiVersion: oam.verrazzano.io/v1alpha1
22+
kind: IngressTrait
23+
metadata:
24+
name: frontend-helidon-ingress
25+
spec:
26+
rules:
27+
- paths:
28+
- path: "/"
29+
pathType: Prefix

‎grabdish/inventory-dotnet/inventory-dotnet-app.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
apiVersion: core.oam.dev/v1alpha2
44
kind: ApplicationConfiguration
55
metadata:
6-
name: order-helidon-appconf
6+
name: inventory-dotnet-appconf
77
namespace: msdataworkshop
88
annotations:
99
version: v1.0.0
10-
description: "Order Helidon application"
10+
description: "Inventory .NET application"
1111
spec:
1212
components:
13-
- componentName: order-helidon-component
13+
- componentName: inventory-dotnet-component
1414
traits:
1515
- trait:
1616
apiVersion: oam.verrazzano.io/v1alpha1
@@ -21,9 +21,9 @@ spec:
2121
# apiVersion: oam.verrazzano.io/v1alpha1
2222
# kind: IngressTrait
2323
# metadata:
24-
# name: order-helidon-ingress
24+
# name: inventory-dotnet-ingress
2525
# spec:
2626
# rules:
2727
# - paths:
28-
# - path: "/command"
28+
# - path: "/"
2929
# pathType: Prefix

‎grabdish/inventory-go/inventory-go-app.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
apiVersion: core.oam.dev/v1alpha2
44
kind: ApplicationConfiguration
55
metadata:
6-
name: order-helidon-appconf
6+
name: inventory-go-appconf
77
namespace: msdataworkshop
88
annotations:
99
version: v1.0.0
10-
description: "Order Helidon application"
10+
description: "Inventory Go application"
1111
spec:
1212
components:
13-
- componentName: order-helidon-component
13+
- componentName: inventory-go-component
1414
traits:
1515
- trait:
1616
apiVersion: oam.verrazzano.io/v1alpha1
@@ -21,7 +21,7 @@ spec:
2121
# apiVersion: oam.verrazzano.io/v1alpha1
2222
# kind: IngressTrait
2323
# metadata:
24-
# name: order-helidon-ingress
24+
# name: inventory-go-ingress
2525
# spec:
2626
# rules:
2727
# - paths:

‎grabdish/inventory-helidon-se/inventory-helidon-se-app.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
apiVersion: core.oam.dev/v1alpha2
44
kind: ApplicationConfiguration
55
metadata:
6-
name: order-helidon-appconf
6+
name: inventory-helidon-se-appconf
77
namespace: msdataworkshop
88
annotations:
99
version: v1.0.0
10-
description: "Order Helidon application"
10+
description: "Inventory Helidon SE application"
1111
spec:
1212
components:
13-
- componentName: order-helidon-component
13+
- componentName: inventory-helidon-se-component
1414
traits:
1515
- trait:
1616
apiVersion: oam.verrazzano.io/v1alpha1
@@ -21,9 +21,9 @@ spec:
2121
# apiVersion: oam.verrazzano.io/v1alpha1
2222
# kind: IngressTrait
2323
# metadata:
24-
# name: order-helidon-ingress
24+
# name: inventory-helidon-se-ingress
2525
# spec:
2626
# rules:
2727
# - paths:
28-
# - path: "/command"
28+
# - path: "/"
2929
# pathType: Prefix

‎grabdish/inventory-helidon/inventory-helidon-app.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
apiVersion: core.oam.dev/v1alpha2
44
kind: ApplicationConfiguration
55
metadata:
6-
name: order-helidon-appconf
6+
name: inventory-helidon-appconf
77
namespace: msdataworkshop
88
annotations:
99
version: v1.0.0
10-
description: "Order Helidon application"
10+
description: "Inventory Helidon application"
1111
spec:
1212
components:
13-
- componentName: order-helidon-component
13+
- componentName: inventory-helidon-component
1414
traits:
1515
- trait:
1616
apiVersion: oam.verrazzano.io/v1alpha1
@@ -21,9 +21,9 @@ spec:
2121
# apiVersion: oam.verrazzano.io/v1alpha1
2222
# kind: IngressTrait
2323
# metadata:
24-
# name: order-helidon-ingress
24+
# name: inventory-helidon-ingress
2525
# spec:
2626
# rules:
2727
# - paths:
28-
# - path: "/command"
28+
# - path: "/"
2929
# pathType: Prefix

‎grabdish/inventory-nodejs/inventory-nodejs-app.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
apiVersion: core.oam.dev/v1alpha2
44
kind: ApplicationConfiguration
55
metadata:
6-
name: order-helidon-appconf
6+
name: inventory-nodejs-appconf
77
namespace: msdataworkshop
88
annotations:
99
version: v1.0.0
10-
description: "Order Helidon application"
10+
description: "Inventory JS application"
1111
spec:
1212
components:
13-
- componentName: order-helidon-component
13+
- componentName: inventory-nodejs-component
1414
traits:
1515
- trait:
1616
apiVersion: oam.verrazzano.io/v1alpha1
@@ -21,9 +21,9 @@ spec:
2121
# apiVersion: oam.verrazzano.io/v1alpha1
2222
# kind: IngressTrait
2323
# metadata:
24-
# name: order-helidon-ingress
24+
# name: inventory-nodejs-ingress
2525
# spec:
2626
# rules:
2727
# - paths:
28-
# - path: "/command"
28+
# - path: "/"
2929
# pathType: Prefix

‎grabdish/inventory-python/inventory-python-app.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
apiVersion: core.oam.dev/v1alpha2
44
kind: ApplicationConfiguration
55
metadata:
6-
name: order-helidon-appconf
6+
name: inventory-python-appconf
77
namespace: msdataworkshop
88
annotations:
99
version: v1.0.0
10-
description: "Order Helidon application"
10+
description: "Inventory Python application"
1111
spec:
1212
components:
13-
- componentName: order-helidon-component
13+
- componentName: inventory-python-component
1414
traits:
1515
- trait:
1616
apiVersion: oam.verrazzano.io/v1alpha1
@@ -25,5 +25,5 @@ spec:
2525
# spec:
2626
# rules:
2727
# - paths:
28-
# - path: "/command"
28+
# - path: "/"
2929
# pathType: Prefix

‎grabdish/order-helidon/order-helidon-app.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ spec:
1717
kind: MetricsTrait
1818
spec:
1919
scraper: verrazzano-system/vmi-system-prometheus-0
20-
# - trait:
21-
# apiVersion: oam.verrazzano.io/v1alpha1
22-
# kind: IngressTrait
23-
# metadata:
24-
# name: order-helidon-ingress
25-
# spec:
26-
# rules:
27-
# - paths:
28-
# - path: "/command"
29-
# pathType: Prefix
20+
- trait:
21+
apiVersion: oam.verrazzano.io/v1alpha1
22+
kind: IngressTrait
23+
metadata:
24+
name: order-helidon-ingress
25+
spec:
26+
rules:
27+
- paths:
28+
- path: "/"
29+
pathType: Prefix

‎grabdish/setup-multicloud.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
# The following setup and install of Verrazzano is taken directly from https://verrazzano.io/docs/setup/quickstart/
66

77
echo Setting up Verrazzano...
8-
#echo Deploying the Verrazzano platform operator...
9-
#kubectl apply -f https://github.com/verrazzano/verrazzano/releases/latest/download/operator.yaml
10-
#echo Waiting for the deployment to complete...
11-
#kubectl -n verrazzano-install rollout status deployment/verrazzano-platform-operator
12-
#echo Confirming that the operator pod is correctly defined and running...
8+
echo Deploying the Verrazzano platform operator...
9+
kubectl apply -f https://github.com/verrazzano/verrazzano/releases/latest/download/operator.yaml
10+
echo Waiting for the deployment to complete...
11+
kubectl -n verrazzano-install rollout status deployment/verrazzano-platform-operator
12+
echo Confirming that the operator pod is correctly defined and running...
1313
kubectl -n verrazzano-install get pods
1414

1515
echo Installing Verrazzano with its dev profile... this will take approximately 20 minutes...
@@ -46,11 +46,11 @@ kubectl label namespace msdataworkshop verrazzano-managed=true istio-injection=e
4646
#echo undeploy any previously deployed microservices... this is not needed unless another workshop using graddish/msdataworkshop was previously deployed
4747
#./undeploy.sh
4848

49-
#echo deploy microservices using Verrazzano Open Application Model...
50-
#./deploy-multicloud.sh
51-
#
52-
#echo Wait for the application to be ready...
53-
#kubectl wait --for=condition=Ready pods --all -n msdataworkshop --timeout=300s
49+
echo deploy microservices using Verrazzano Open Application Model...
50+
./deploy-multicloud.sh
51+
52+
echo Wait for the application to be ready...
53+
kubectl wait --for=condition=Ready pods --all -n msdataworkshop --timeout=300s
5454

5555
echo Saving the host name of the load balancer exposing the Frontend service endpoints...
5656
#HOST=$(kubectl get gateway hello-helidon-hello-helidon-appconf-gw -n hello-helidon -o jsonpath='{.spec.servers[0].hosts[0]}')

0 commit comments

Comments
 (0)