Skip to content

Commit a19a1ce

Browse files
paulparkinsonRichardExleyrenagranat
authored
verrazzano/multi-cloud work (#39)
* 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 Co-authored-by: RichardExley <Richard.exley@oracle.com> Co-authored-by: irina granat <irina.granat@oracle.com>
1 parent fa21449 commit a19a1ce

File tree

4 files changed

+34
-5
lines changed

4 files changed

+34
-5
lines changed

README-multicloud.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Mutli-cloud, Verrazzano version of workshop
2-
#Simplify microservices architecture with Oracle Converged Database
2+
# Simplify microservices architecture with Oracle Converged Database
33

44
0. Starting from http://bit.ly/simplifymicroservices
55

6-
1. Do `Lab 1: Setup` (takes ~20 to 25 minutes)
6+
1. Do `Lab 1: Setup` (takes ~20 minutes)
77
- This will clone the workshop src from https://github.com/oracle/microservices-datadriven,
88
provision and configure the following, and build and push the workshop microservice docker images
99
- OKE cluster
@@ -61,6 +61,7 @@ TODOs
6161
- https://verrazzano.io/docs/concepts/verrazzanomulticluster/#the-verrazzanoproject-resource
6262
- https://verrazzano.io/docs/reference/api/multicluster/verrazzanoproject/
6363
- ./setup-multicloud.sh should take a password to override those auto-generated and password(s) should not be displayed
64+
- test Jaeger functionality
6465
- add walkthrough of consoles...
6566
- reduce the number of required LBs while also keeping the current workshop and multi-cloud workshop independent
6667
- the workshop uses 2 LBs (one for the app and one for Jaeger)

grabdish/setup-multicloud.sh

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,22 @@ kubectl wait \
4343
echo Adding labels identifying the msdataworkshop namespace as managed by Verrazzano and enabled for Istio...
4444
kubectl label namespace msdataworkshop verrazzano-managed=true istio-injection=enabled
4545

46+
echo Adding VerrazzanoProject
47+
#export CLUSTERS_NAME="$(state_get OCI_REGION)"
48+
export CLUSTERS_NAME="$(state_get CLUSTER_NAME)" # eg cluster-cyxypetwerq, also notice the plural/CLUSTERS_NAME and singular/CLUSTER_NAME
49+
export CURRENTTIME=$( date '+%F_%H:%M:%S' )
50+
echo CURRENTTIME is $CURRENTTIME ...this will be appended to generated verrazzano-project yaml for CLUSTERS_NAME ${CLUSTERS_NAME}
51+
cp verrazzano-project.yaml verrazzano-project-$CURRENTTIME.yaml
52+
sed -i "s|%CLUSTERS_NAME%|${CLUSTERS_NAME}|g" verrazzano-project-$CURRENTTIME.yaml
53+
kubectl apply -f verrazzano-project-$CURRENTTIME.yaml
54+
55+
# without the above it is necessary to
56+
#kubectl edit authorizationpolicy supplier-helidon-se-appconf -n msdataworkshop
57+
#and
58+
#kubectl edit authorizationpolicy order-helidon-appconf -n msdataworkshop
59+
#adding the following under rules: from: source: principals:
60+
#- cluster.local/ns/msdataworkshop/sa/frontend-helidon-appconf
61+
4662
#echo undeploy any previously deployed microservices... this is not needed unless another workshop using graddish/msdataworkshop was previously deployed
4763
#./undeploy.sh
4864

@@ -52,8 +68,8 @@ echo deploy microservices using Verrazzano Open Application Model...
5268
echo Wait for the application to be ready... # msdataworkshop-frontend-helidon-appconf-gw and msdataworkshop-order-helidon-appconf-gw
5369
kubectl wait --for=condition=Ready pods --all -n msdataworkshop --timeout=300s
5470

55-
echo Display all gateways in msdataworkshop...
56-
kubectl get gateway -n msdataworkshop
71+
echo Display istio resources in msdataworkshop...
72+
getistio
5773

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

grabdish/supplier-helidon-se/supplier-helidon-se-app.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ spec:
2727
- paths:
2828
- path: "/"
2929
pathType: Prefix
30-

grabdish/verrazzano-project.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: clusters.verrazzano.io/v1alpha1
2+
kind: VerrazzanoProject
3+
metadata:
4+
name: msdataworkshop
5+
namespace: verrazzano-mc
6+
spec:
7+
template:
8+
namespaces:
9+
- metadata:
10+
name: msdataworkshop
11+
placement:
12+
clusters:
13+
- name: %CLUSTERS_NAME%

0 commit comments

Comments
 (0)