Skip to content

Commit df15e5e

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

File tree

6 files changed

+59
-18
lines changed

6 files changed

+59
-18
lines changed

‎README-multicloud.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,10 @@
5656
- `./destroy-multicloud.sh` (to remove Verrazzano)
5757

5858
TODOs
59-
- one open issue: RBAC source access (currently this done by manually changing the authorizationpolicy after the fact)
60-
and the appropriate way is (if all ms are not in the same app) is to use a project. Doc refs...
61-
- https://verrazzano.io/docs/concepts/verrazzanomulticluster/#the-verrazzanoproject-resource
62-
- https://verrazzano.io/docs/reference/api/multicluster/verrazzanoproject/
6359
- ./setup-multicloud.sh should take a password to override those auto-generated and password(s) should not be displayed
6460
- test Jaeger functionality
6561
- add walkthrough of consoles...
66-
- reduce the number of required LBs while also keeping the current workshop and multi-cloud workshop independent
62+
- possibly reduce the number of required LBs while also keeping the current workshop and multi-cloud workshop independent
6763
- the workshop uses 2 LBs (one for the app and one for Jaeger)
6864
- the scaling lab uses an additional 1 LB for requests as they go directly to the order service.
6965
- Verrazzano uses 2 LBs (one for consoles and one for apps)

‎grabdish/deploy-multicloud.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ for s in $MS; do
88
echo "Deploying $s..."
99
echo ________________________________________
1010
cd $GRABDISH_HOME/$s
11-
./undeploy-verrazzano.sh
11+
./deploy-verrazzano.sh
1212
cd $GRABDISH_HOME
1313
done
1414

‎grabdish/inventory-dotnet/dequeueenqueue.sql

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ IS
1212
pragma exception_init(no_messages, -25228);
1313

1414
BEGIN
15-
dequeue_options.wait := dbms_aq.NO_WAIT;
15+
-- dequeue_options.wait := dbms_aq.NO_WAIT;
1616
-- dequeue_options.wait := dbms_aq.FOREVER;
1717
-- dequeue_options.navigation := dbms_aq.FIRST_MESSAGE;
1818
-- dequeue_options.dequeue_mode := dbms_aq.LOCKED;
@@ -23,7 +23,6 @@ BEGIN
2323
message_properties => message_properties,
2424
payload => message,
2525
msgid => message_handle);
26-
-- COMMIT;
2726

2827
-- p_action := message.get_string_property('action');
2928
-- p_orderid := message.get_int_property('orderid');
@@ -82,3 +81,31 @@ BEGIN
8281
END;
8382
/
8483
show errors
84+
85+
select t1.sid, t1.serial#, t2.sql_fulltext
86+
from gv$session t1, gv$sql t2
87+
where t1.sql_id = t2.sql_id
88+
89+
DECLARE
90+
p_orderInfo varchar2(30);
91+
BEGIN
92+
dequeueOrderMessage(p_orderInfo);
93+
EXCEPTION
94+
when others then
95+
dbms_output.put_line(SQLERRM);
96+
END;
97+
/
98+
99+
DECLARE
100+
BEGIN
101+
enqueueInventoryMessage('asdf');
102+
EXCEPTION
103+
when others then
104+
dbms_output.put_line(SQLERRM);
105+
END;
106+
/
107+
commit;
108+
109+
select QUEUE_NAME, ENQUEUED_MSGS, DEQUEUED_MSGS from v$persistent_queues
110+
select SES_ADDR from v$transaction
111+
xterm to atp to get pstack

‎grabdish/inventory-helidon/src/main/java/io/helidon/data/examples/InventoryServiceOrderEventConsumer.java

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111

1212
import javax.jms.*;
1313
import java.lang.IllegalStateException;
14+
import java.sql.*;
1415
import java.sql.Connection;
15-
import java.sql.ResultSet;
16-
import java.sql.SQLException;
17-
import java.sql.Types;
1816

1917
public class InventoryServiceOrderEventConsumer implements Runnable {
2018

@@ -38,6 +36,26 @@ public void run() {
3836
}
3937

4038
public void listenForOrderEvents() throws Exception {
39+
Connection connection = inventoryResource.atpInventoryPDB.getConnection();
40+
while (true) {
41+
System.out.println("InventoryServiceOrderEventConsumer.listenForOrderEvents with sproc");
42+
CallableStatement cstmt = null;
43+
String SQL = "{call dequeueOrderMessage (?)}";
44+
cstmt = connection.prepareCall(SQL);
45+
cstmt.registerOutParameter(1, Types.VARCHAR);
46+
// cstmt.registerOutParameter("p_orderInfo", Types.VARCHAR);
47+
boolean hadResults = cstmt.execute();
48+
System.out.println("InventoryServiceOrderEventConsumer.listenForOrderEvents hadResults:" + hadResults);
49+
while (hadResults) {
50+
ResultSet rs = cstmt.getResultSet();
51+
hadResults = cstmt.getMoreResults();
52+
}
53+
String outputValue = cstmt.getString(1); // index-based
54+
System.out.println("InventoryServiceOrderEventConsumer.listenForOrderEvents outputValue:" + outputValue);
55+
}
56+
}
57+
58+
public void listenForOrderEventsAQAPI() throws Exception {
4159
QueueConnectionFactory qcfact = AQjmsFactory.getQueueConnectionFactory(inventoryResource.atpInventoryPDB);
4260
QueueSession qsess = null;
4361
QueueConnection qconn = null;

‎grabdish/setup-multicloud.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@ cp verrazzano-project.yaml verrazzano-project-$CURRENTTIME.yaml
5252
sed -i "s|%CLUSTERS_NAME%|${CLUSTERS_NAME}|g" verrazzano-project-$CURRENTTIME.yaml
5353
kubectl apply -f verrazzano-project-$CURRENTTIME.yaml
5454

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-
6255
#echo undeploy any previously deployed microservices... this is not needed unless another workshop using graddish/msdataworkshop was previously deployed
6356
#./undeploy.sh
6457

‎grabdish/utils/getverrazzano

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
## Copyright (c) 2021 Oracle and/or its affiliates.
3+
## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
4+
5+
echo displaying VerrazzanoProjects...
6+
7+
k get VerrazzanoProjects --all-namespaces

0 commit comments

Comments
 (0)