Skip to content

Commit

Permalink
bump istio to 1.20.3 and gateway api to v1 (#627)
Browse files Browse the repository at this point in the history
* bump istio to 1.20.3 and gateway api to v1

* Don't wait for Gateway API Webhook

This component was removed so it's not necessary to do this anymore
  • Loading branch information
dprotaso authored Feb 23, 2024
1 parent 3710fac commit 3642f6a
Show file tree
Hide file tree
Showing 4 changed files with 1,379 additions and 680 deletions.
4 changes: 2 additions & 2 deletions docs/test-version.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ The following Gateway API version and Ingress were tested as part of the release

| Tested Gateway API |
| ------------------------ |
| v0.8.1 |
| v1.0.0 |

### Tested Ingress

| Ingress | Tested version | Unavailable features |
| ------- | ----------------------- | ------------------------------ |
| Istio | v1.19.3 | retry,httpoption |
| Istio | v1.20.3 | retry,httpoption |
| Contour | v1.28.1 | httpoption,basics/http2,grpc,grpc/split,update |
4 changes: 2 additions & 2 deletions hack/test-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

export GATEWAY_API_VERSION="v0.8.1"
export ISTIO_VERSION="1.19.3"
export GATEWAY_API_VERSION="v1.0.0"
export ISTIO_VERSION="1.20.3"
export ISTIO_UNSUPPORTED_E2E_TESTS="retry,httpoption"
export CONTOUR_VERSION="v1.28.1"
export CONTOUR_UNSUPPORTED_E2E_TESTS="httpoption,basics/http2,grpc,grpc/split,update"
8 changes: 1 addition & 7 deletions test/e2e-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@ function knative_teardown() {
function setup_networking() {
echo ">> Installing Gateway API CRDs"
kubectl apply -f "${REPO_ROOT_DIR}/third_party/gateway-api/gateway-api.yaml" || return $?
kubectl wait --for=condition=complete --timeout=60s -n "gateway-system" job/gateway-api-admission
kubectl wait --for=condition=complete --timeout=60s -n "gateway-system" job/gateway-api-admission-patch

# make sure webhook is ready.
kubectl wait -n gateway-system --for=condition=Available --timeout=60s deploy --all

if [[ "${INGRESS}" == "contour" ]]; then
setup_contour
Expand All @@ -104,7 +99,7 @@ function setup_networking() {

function teardown_networking() {
kubectl delete -f "${REPO_ROOT_DIR}/third_party/${INGRESS}"
kubectl delete -f "${REPO_ROOT_DIR}/third_party/gateway-api/gateway-api.yaml"
kubectl delete -f "${REPO_ROOT_DIR}/third_party/gateway-api/gateway-api.yaml"

if [[ "$INGRESS" == "contour" ]]; then
kubectl delete -f "https://raw.githubusercontent.com/projectcontour/contour/${CONTOUR_VERSION}/examples/render/contour-gateway-provisioner.yaml"
Expand All @@ -118,7 +113,6 @@ function setup_contour() {
# Version is selected is in $REPO_ROOT/hack/test-env.sh
kubectl apply -f "https://raw.githubusercontent.com/projectcontour/contour/${CONTOUR_VERSION}/examples/render/contour-gateway-provisioner.yaml" && \
kubectl wait deploy --for=condition=Available --timeout=60s -n projectcontour contour-gateway-provisioner && \
kubectl wait deploy --for=condition=Available --timeout=60s -n gateway-system gateway-api-admission-server && \
kubectl apply -f "${REPO_ROOT_DIR}/third_party/contour"

local ret=$?
Expand Down
Loading

0 comments on commit 3642f6a

Please sign in to comment.