Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

reduce logging verbosity some more #3037

Merged
merged 2 commits into from Feb 21, 2022
Merged

reduce logging verbosity some more #3037

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95f441f
chore: reduce logging verbosity some more
shreddedbacon Feb 18, 2022
266f77c
chore: merge branch 'main' into minor-log-verbosity-reduction
shreddedbacon Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions images/kubectl-build-deploy-dind/build-deploy-docker-compose.sh
View file
Open in desktop
Expand Up @@ -187,7 +187,6 @@ HELM_ARGUMENTS=()
for CAPABILITIES in "${CAPABILITIES[@]}"; do
HELM_ARGUMENTS+=(-a "${CAPABILITIES}")
done
set -x

# Implement global default values for backup retention periods
if [ -z "$MONTHLY_BACKUP_DEFAULT_RETENTION" ]
Expand Down Expand Up @@ -739,9 +738,12 @@ for i in $ROUTES_AUTOGENERATE_PREFIXES; do yq3 write -i -- /kubectl-build-deploy
yq3 write -i -- /kubectl-build-deploy/values.yaml 'kubernetes' $KUBERNETES
yq3 write -i -- /kubectl-build-deploy/values.yaml 'lagoonVersion' $LAGOON_VERSION
# check for ROOTLESS_WORKLOAD feature flag, disabled by default

set +x
if [ "$(featureFlag ROOTLESS_WORKLOAD)" = enabled ]; then
yq3 merge -ix -- /kubectl-build-deploy/values.yaml /kubectl-build-deploy/rootless.values.yaml
fi
set -x


echo -e "\
Expand Down Expand Up @@ -1220,12 +1222,14 @@ if [[ "${CAPABILITIES[@]}" =~ "backup.appuio.ch/v1alpha1/Schedule" ]]; then
fi

# check for ISOLATION_NETWORK_POLICY feature flag, disabled by default
set +x
if [ "$(featureFlag ISOLATION_NETWORK_POLICY)" = enabled ]; then
# add namespace isolation network policy to deployment
helm template isolation-network-policy /kubectl-build-deploy/helmcharts/isolation-network-policy \
-f /kubectl-build-deploy/values.yaml \
> $YAML_FOLDER/isolation-network-policy.yaml
fi
set -x

if [ "$(ls -A $YAML_FOLDER/)" ]; then
find $YAML_FOLDER -type f -exec cat {} \;
Expand Down Expand Up @@ -1696,6 +1700,7 @@ patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${N
previousStepEnd=${currentStepEnd}
set -x

set +x
if [ "$(featureFlag INSIGHTS)" = enabled ]; then
##############################################
### RUN sbom generation and store in configmap
Expand All @@ -1709,9 +1714,8 @@ if [ "$(featureFlag INSIGHTS)" = enabled ]; then
. /kubectl-build-deploy/scripts/exec-generate-sbom-configmap.sh
done

set +x
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "sbomCompleted" "SBOM Gathering"
previousStepEnd=${currentStepEnd}
set -x
fi
set -x