Skip to content

Commit

Permalink
removed gateway api crds from config dir so they are not shipped with…
Browse files Browse the repository at this point in the history
… the project, updated test and docs + updated ko-build action
  • Loading branch information
gabo1208 committed Oct 13, 2023
1 parent 971bb14 commit 703031c
Show file tree
Hide file tree
Showing 5 changed files with 11,064 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/kind-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
with:
go-version: 1.21.x

- uses: imjasonh/setup-ko@v0.6
- uses: ko-build/setup-ko@v0.6

- name: Setup KinD
uses: chainguard-dev/actions/setup-kind@main
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ source ./hack/test-env.sh
```bash
# gateway-api CRD must be installed before Istio.
echo ">> Installing Gateway API CRDs"
kubectl apply -f config/100-gateway-api.yaml
kubectl apply -f third_party/gateway-api/gateway-api.yaml

echo ">> Bringing up Istio"
curl -sL https://istio.io/downloadIstioctl | sh -
Expand Down
2 changes: 1 addition & 1 deletion hack/update-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ source ${REPO_ROOT_DIR}/hack/test-env.sh
go_update_deps "$@"

group "Update Gateway API CRDs to version ${GATEWAY_API_VERSION}"
curl -L https://github.com/kubernetes-sigs/gateway-api/releases/download/${GATEWAY_API_VERSION}/experimental-install.yaml > "${REPO_ROOT_DIR}/config/100-gateway-api.yaml"
curl -L https://github.com/kubernetes-sigs/gateway-api/releases/download/${GATEWAY_API_VERSION}/experimental-install.yaml > "${REPO_ROOT_DIR}/third_party/gateway-api/gateway-api.yaml"
4 changes: 3 additions & 1 deletion test/e2e-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ function knative_teardown() {
}

function setup_networking() {
kubectl apply -f config/100-gateway-api.yaml || return $?
echo ">> Installing Gateway API CRDs"
kubectl apply -f "${REPO_ROOT_DIR}/third_party/gateway-api/gateway-api.yaml" || return $?

if [[ "${INGRESS}" == "contour" ]]; then
setup_contour
Expand All @@ -98,6 +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"

if [[ "$INGRESS" == "contour" ]]; then
kubectl delete -f "https://raw.githubusercontent.com/projectcontour/contour-operator/${CONTOUR_VERSION}/examples/operator/operator.yaml"
Expand Down
Loading

0 comments on commit 703031c

Please sign in to comment.