diff --git a/chart/templates/logging/fluentbit/fluentbit-helmrelease.yaml b/chart/templates/logging/fluentbit/fluentbit-helmrelease.yaml index 846467d093b07e8d294d97781d85d3c3505c85ec..9b825e6e7ca9a7895a02dd2a3e5495b54fbcef07 100644 --- a/chart/templates/logging/fluentbit/fluentbit-helmrelease.yaml +++ b/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 diff --git a/scripts/deploy/02_wait_for_helmreleases.sh b/scripts/deploy/02_wait_for_helmreleases.sh index 6650f4bf2c7f1928b40e8a96c49125b3b9bf812c..b62a57bc773c88ce8d7f43a60506e027ce074d24 100755 --- a/scripts/deploy/02_wait_for_helmreleases.sh +++ b/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