Rebase and formatting

scripts/deploy/01_deploy_bigbang.sh

@@ -10,6 +10,7 @@ flux check --pre
 # Install flux in the cluster
 kubectl create ns flux-system || true
 
+# TODO When changing the flux images to .mil this will need to chagne
 kubectl create secret docker-registry private-registry -n flux-system \
    --docker-server=registry1.dsop.io \
    --docker-username='robot$bigbang' \
@@ -25,8 +26,11 @@ flux check
 # Deploy BigBang using dev sized scaling
 echo "Installing BigBang"
 helm upgrade -i bigbang chart -n bigbang --create-namespace \
-  --set registryCredentials.username='robot$bigbang' --set registryCredentials.password=${REGISTRY1_PASSWORD} \
-  -f tests/ci/k3d/values.yaml
+--set registryCredentials[0].username='robot$bigbang' --set registryCredentials[0].password=${REGISTRY1_PASSWORD} \
+--set registryCredentials[0].registry=registry1.dsop.io                                                         \
+--set registryCredentials[1].username='robot$bigbang' --set registryCredentials[1].password=${REGISTRY1_PASSWORD} \
+--set registryCredentials[1].registry=registry1.dso.mil                                                         \
+-f tests/ci/k3d/values.yaml
 
 ## Apply secrets kustomization pointing to current branch
 echo "Deploying secrets from the ${CI_COMMIT_REF_NAME} branch"

scripts/deploy/02_wait_for_helmrealeases.sh

@@ -3,7 +3,7 @@
 set -e
 
 ## This is an array to instantiate the order of wait conditions
-ORDERED_HELMRELEASES="gatekeeper istio-operator istio monitoring eck-operator ek fluent-bit twistlock cluster-auditor"
+ORDERED_HELMRELEASES="gatekeeper istio-operator istio monitoring eck-operator ek fluent-bit twistlock cluster-auditor gitlab"
 
 
 ## This the actual deployed helmrelease objects in the cluster

tests/ci/k3d/values.yaml

@@ -58,3 +58,11 @@ addons:
     enabled: true
   authservice:
     enabled: true
+  gitlab:
+    enabled: true
+    values:
+      postgresql:
+        install: true
+      global:
+        minio:
+          enabled: true