Skip to content
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
15 changes: 15 additions & 0 deletions test/e2e-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,20 @@ function create_spoke_cluster() {
KUBECONFIG="${SPOKE_HOST_KUBECONFIG}" kubectl -n kube-system rollout status deployment/coredns --timeout=120s || return 1
}

function install_spoke_gateway_api_crds() {
echo ">> Installing Gateway API CRDs on spoke"
KUBECONFIG="${SPOKE_HOST_KUBECONFIG}" kubectl apply --server-side -f "${SPOKE_GATEWAY_API_CRD_URL}" || return 1

local crd
for crd in \
gatewayclasses.gateway.networking.k8s.io \
gateways.gateway.networking.k8s.io \
httproutes.gateway.networking.k8s.io \
referencegrants.gateway.networking.k8s.io; do
KUBECONFIG="${SPOKE_HOST_KUBECONFIG}" kubectl wait --for=condition=Established --timeout=60s "crd/${crd}" || return 1
done
}

function delete_spoke_cluster() {
if kind get clusters 2>/dev/null | grep -q "^${SPOKE_CLUSTER_NAME}$"; then
kind delete cluster --name "${SPOKE_CLUSTER_NAME}" --kubeconfig "${SPOKE_HOST_KUBECONFIG}"
Expand Down Expand Up @@ -537,6 +551,7 @@ function setup_multicluster_e2e() {
done

create_spoke_cluster || return 1
install_spoke_gateway_api_crds || return 1
install_cluster_inventory_crd || return 1
install_access_provider_config || return 1
apply_cluster_profile "default" || return 1
Expand Down
2 changes: 2 additions & 0 deletions test/e2e-tests-multicluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ source "$(dirname "$0")/e2e-common.sh"
: "${MC_PROVIDER_TOKEN_MOUNT_PATH:=/etc/cluster-inventory/access}"
: "${MC_PROVIDER_PLUGIN_MOUNT_PATH:=/etc/cluster-inventory/plugin}"
: "${MC_PROVIDER_NAME:=e2e-static-token}"
: "${SPOKE_GATEWAY_API_CRD_URL:=https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.1/experimental-install.yaml}"
export SPOKE_CLUSTER_NAME SPOKE_KUBECONFIG SPOKE_HOST_KUBECONFIG
export CLUSTER_INVENTORY_CRD_URL MC_PROVIDER_CONFIGMAP MC_PROVIDER_TOKEN_SECRET
export MC_PROVIDER_MOUNT_PATH MC_PROVIDER_TOKEN_MOUNT_PATH
export MC_PROVIDER_PLUGIN_MOUNT_PATH MC_PROVIDER_NAME
export SPOKE_GATEWAY_API_CRD_URL

function knative_setup() {
create_namespace
Expand Down
Loading