Merge branch 'micah.nagel-master-patch-87283' into 'master'

Misc changes found via nightly CI

See merge request platform-one/big-bang/bigbang!820

chart/templates/logging/fluentbit/fluentbit-helmrelease.yaml

@@ -41,14 +41,16 @@ spec:
   dependsOn:
     - name: ek
       namespace: {{ .Release.Namespace }}
-
     {{- if  .Values.gatekeeper.enabled }}
     - name: gatekeeper
       namespace: {{ .Release.Namespace }}
     {{- end }}
-
     {{- if .Values.istio.enabled }}
     - name: istio
       namespace: {{ .Release.Namespace }}
+    {{- end }}
+    {{- if .Values.monitoring.enabled }}
+    - name: monitoring
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
   {{- end }}
-  {{- end }}
\ No newline at end of file

scripts/deploy/02_wait_for_helmreleases.sh

@@ -141,7 +141,7 @@ elif [[ ! -z "$CI_MERGE_REQUEST_LABELS" ]]; then
 fi
 
 echo "Waiting on GitRepositories"
-kubectl wait --for=condition=Ready --timeout 60s gitrepositories -n bigbang --all
+kubectl wait --for=condition=Ready --timeout 180s gitrepositories -n bigbang --all
 
 for package in "${HELMRELEASES[@]}";
 do