Skip to content

Commit e455fa8

Browse files
authored
Oke errors (#34)
* 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 * 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 * Manage Non-Java Builds Better * Update main-destroy.sh * 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 * Fixed inventory-helidon-se * Minor fixes * Fixes go build.sh fix * Update oke-setup.sh * Update db-setup.sh Fixed unprotected password * Give DB_PASSWORD priority
1 parent 0791659 commit e455fa8

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

grabdish/utils/db-setup.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ while ! state_done OKE_NAMESPACE; do
6161
done
6262

6363

64+
# Give DB_PASSWORD priority
65+
while ! state_done DB_PASSWORD; do
66+
echo "Waiting for DB_PASSWORD"
67+
sleep 5
68+
done
69+
70+
6471
# Create Inventory ATP Bindings
6572
while ! state_done DB_WALLET_SECRET; do
6673
cd $GRABDISH_HOME/wallet

grabdish/utils/oke-setup.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ done
1818
while ! state_done PROVISIONING; do
1919
echo "`date`: Waiting for terraform provisioning"
2020
sleep 10
21-
done
21+
done
2222

2323

2424
# Get OKE OCID
@@ -59,6 +59,13 @@ while ! state_done OKE_NAMESPACE; do
5959
done
6060

6161

62+
# Give DB_PASSWORD priority
63+
while ! state_done DB_PASSWORD; do
64+
echo "Waiting for DB_PASSWORD"
65+
sleep 5
66+
done
67+
68+
6269
# Create SSL Secret
6370
while ! state_done SSL_SECRET; do
6471
if kubectl create secret tls ssl-certificate-secret --key $GRABDISH_HOME/tls/tls.key --cert $GRABDISH_HOME/tls/tls.crt -n msdataworkshop; then
@@ -93,4 +100,4 @@ while ! state_done JAEGER; do
93100
done
94101

95102

96-
state_set_done OKE_SETUP
103+
state_set_done OKE_SETUP

0 commit comments

Comments
 (0)