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.

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

fix/adapt scripts to work on mac #2199

Merged
merged 1 commit into from
Feb 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion scripts/deploy-on-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ set -euo pipefail
ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
SCRIPT_DIR="${ROOT_DIR}/scripts"

# workaround for https://github.com/carvel-dev/kbld/issues/213
# kbld fails with git error messages in languages than other english
export LC_ALL=en_US.UTF-8

function usage_text() {
cat <<EOF
Usage:
Expand Down Expand Up @@ -172,7 +176,7 @@ function deploy_korifi() {
--namespace korifi \
--values=scripts/assets/values.yaml \
--set=global.debug="$doDebug" \
"${registry_configuration[@]}" \
${registry_configuration[@]-} \
--wait
fi
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ kubectl -n servicebinding-system rollout status deployment/servicebinding-contro
kubectl apply -f "$VENDOR_DIR/service-binding/servicebinding-workloadresourcemappings-v"*".yaml"

if ! kubectl get apiservice v1beta1.metrics.k8s.io >/dev/null 2>&1; then
if [[ -v INSECURE_TLS_METRICS_SERVER ]]; then
if [[ "${INSECURE_TLS_METRICS_SERVER}" == "true" ]]; then
echo "************************************************"
echo " Installing Metrics Server Insecure TLS options"
echo "************************************************"
Expand Down