Merge branch 'staging' into 'bb-597'

# Conflicts:
#   .gitignore
#   .gitlab-ci.yml
#   base/gitrepository.yaml

.gitignore

@@ -8,6 +8,7 @@ certs/
 *rke2.yaml
 
 *tfstate*
+*terraform.lock*
 
 # dependencies
 /node_modules

.gitlab-ci.yml

@@ -340,7 +340,7 @@ aws/rke2/cluster down:
 
 package:
   stage: package
-  image: registry.dso.mil/platform-one/big-bang/umbrella/synker:0.0.1
+  image: registry.dso.mil/platform-one/big-bang/bigbang/synker:0.0.1
   extends:
     - .bigbang-dogfood
   rules:

.gitlab-ci/jobs/rke2/dependencies/k8s-resources/aws/default-ebs-sc.yaml

@@ -11,4 +11,4 @@ reclaimPolicy: Delete
 allowVolumeExpansion: true
 mountOptions:
   - debug
-volumeBindingMode: Immediate
\ No newline at end of file
+volumeBindingMode: WaitForFirstConsumer
\ No newline at end of file

scripts/deploy/02_wait_for_helmrealeases.sh

@@ -31,7 +31,7 @@ function array_contains() {
 ## $1: package name
 function wait_on() {
   echo "Waiting on package $1"
-  kubectl wait --for=condition=Ready --timeout 500s helmrelease -n bigbang $1;
+  kubectl wait --for=condition=Ready --timeout 600s helmrelease -n bigbang $1;
 }
 
 for package in $ORDERED_HELMRELEASES;