|
223 | 223 |
|
224 | 224 | function wait_for_installs() { |
225 | 225 | if [ "$ADMIN_CLUSTER" != "false" ] ; then |
226 | | - $KA wait --timeout=60m --for=condition=InstallComplete verrazzano/admin |
| 226 | + done=1 |
| 227 | + elapsed_time=0 |
| 228 | + while [ $done -ne 0 ] && [ $elapsed_time -lt $VZ_INSTALL_TIMEOUT ] |
| 229 | + do |
| 230 | + install_status=$($KA wait --timeout=3m --for=condition=InstallComplete verrazzano/admin) |
| 231 | + echo $install_status |
| 232 | + if echo "$install_status" | grep -q 'condition met'; then |
| 233 | + echo "verrazzano installation complete" |
| 234 | + echo "It took $elapsed_time minutes to complete verrazzano installation" |
| 235 | + done=0 |
| 236 | + else |
| 237 | + elapsed_time=$((elapsed_time + 3)) |
| 238 | + echo "verrazzano installtion is not complete" |
| 239 | + fi |
| 240 | + $KA get all -A |
| 241 | + $KA get events -A --sort-by=.lastTimestamp |
| 242 | + done |
227 | 243 | fi |
228 | 244 | if [ "$MANAGED_CLUSTER" != "false" ] ; then |
229 | 245 | $K1 wait --timeout=60m --for=condition=InstallComplete verrazzano/managed1 |
@@ -419,19 +435,19 @@ if [ "$REGISTER_ONLY" != "true" ]; then |
419 | 435 | delete_cluster admin |
420 | 436 | delete_cluster managed1 |
421 | 437 |
|
422 | | -SUBNET=$(${WLSIMG_BUILDER:-docker} inspect kind | jq '.[0].IPAM.Config[0].Subnet' -r | sed 's|/.*||g') |
423 | | -ADMIN_ADDR_RANGE="${SUBNET%.*}.230-${SUBNET%.*}.250" |
424 | | -MANAGED1_ADDR_RANGE="${SUBNET%.*}.210-${SUBNET%.*}.229" |
425 | | - |
426 | 438 | if [ "$ADMIN_CLUSTER" != "false" ] ; then |
427 | 439 | echo |
428 | 440 | create_cluster admin |
| 441 | + SUBNET=$(${WLSIMG_BUILDER:-docker} inspect kind | jq '.[0].IPAM.Config[0].Subnet' -r | sed 's|/.*||g') |
| 442 | + ADMIN_ADDR_RANGE="${SUBNET%.*}.230-${SUBNET%.*}.250" |
429 | 443 | install_metallb $ADMIN_ADDR_RANGE "$KA" |
430 | 444 | install_verrazzano_admin |
431 | 445 | fi |
432 | 446 | if [ "$MANAGED_CLUSTER" != "false" ] ; then |
433 | 447 | echo |
434 | 448 | create_cluster managed1 |
| 449 | + SUBNET=$(${WLSIMG_BUILDER:-docker} inspect kind | jq '.[0].IPAM.Config[0].Subnet' -r | sed 's|/.*||g') |
| 450 | + MANAGED1_ADDR_RANGE="${SUBNET%.*}.210-${SUBNET%.*}.229" |
435 | 451 | install_metallb $MANAGED1_ADDR_RANGE "$K1" |
436 | 452 | install_verrazzano_managed |
437 | 453 | fi |
|
0 commit comments