From 11145496212726d603c4b1c1207600389bd608fa Mon Sep 17 00:00:00 2001 From: Matt Royal Date: Fri, 19 Aug 2022 16:55:48 -0700 Subject: [PATCH] Revert to contour v1.22-latest image when kbld is installed See https://github.com/envoyproxy/envoy/issues/22261 for details. For now, v1.22-latest appears to work. v1.23-latest should work soon. We can remove this change once there's a new contour release that includes a fixed envoy. --- scripts/install-dependencies.sh | 8 +++++++- .../kbld-image-mapping-to-fix-envoy-v1.23-bug.json | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 tests/dependencies/contour/kbld-image-mapping-to-fix-envoy-v1.23-bug.json diff --git a/scripts/install-dependencies.sh b/scripts/install-dependencies.sh index a47f8f4d3..02af7dc88 100755 --- a/scripts/install-dependencies.sh +++ b/scripts/install-dependencies.sh @@ -114,7 +114,13 @@ echo "*******************" echo "Installing Contour ${contour_version}" echo "*******************" -kubectl apply -f https://projectcontour.io/quickstart/contour.yaml +# Temporarily resolve an issue with contour running on Apple silicon. +# This fix can be removed once the latest version of contour uses envoy v1.23.1 or newer +if command -v kbld &> /dev/null; then + kbld --image-map-file "${DEP_DIR}/contour/kbld-image-mapping-to-fix-envoy-v1.23-bug.json" -f https://projectcontour.io/quickstart/contour.yaml | kubectl apply -f - +else + kubectl apply -f https://projectcontour.io/quickstart/contour.yaml +fi sbr_version=$(curl --silent "https://api.github.com/repos/servicebinding/runtime/releases/latest" | jq -r '.tag_name') echo "**************************************" diff --git a/tests/dependencies/contour/kbld-image-mapping-to-fix-envoy-v1.23-bug.json b/tests/dependencies/contour/kbld-image-mapping-to-fix-envoy-v1.23-bug.json new file mode 100644 index 000000000..e5b560e76 --- /dev/null +++ b/tests/dependencies/contour/kbld-image-mapping-to-fix-envoy-v1.23-bug.json @@ -0,0 +1,3 @@ +{ + "docker.io/envoyproxy/envoy:v1.23.0": "docker.io/envoyproxy/envoy:v1.22-latest" +}