Skip to content

Commit

Permalink
Revert to contour v1.22-latest image when kbld is installed
Browse files Browse the repository at this point in the history
See envoyproxy/envoy#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.
  • Loading branch information
matt-royal committed Aug 22, 2022
1 parent 3618bdc commit a98ad6d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
8 changes: 7 additions & 1 deletion scripts/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "**************************************"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"docker.io/envoyproxy/envoy:v1.23.0": "docker.io/envoyproxy/envoy:v1.22-latest"
}

0 comments on commit a98ad6d

Please sign in to comment.