From f23e26374f902e4eeb37227038f32542c96ac08f Mon Sep 17 00:00:00 2001 From: Kent Dong Date: Fri, 22 Sep 2023 02:50:55 -0500 Subject: [PATCH] feat: Use higress as the default gateway class for Gateway API integation (#555) --- Makefile.core.mk | 12 +++++++++--- .../patches/istio/20230922-gateway-class.patch | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 istio/1.12/patches/istio/20230922-gateway-class.patch diff --git a/Makefile.core.mk b/Makefile.core.mk index eb963f94e..1e6433c5c 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -151,10 +151,16 @@ build-pilot: build-gateway: prebuild external/package/envoy-amd64.tar.gz external/package/envoy-arm64.tar.gz build-pilot cd external/istio; BUILD_WITH_CONTAINER=1 BUILDX_PLATFORM=true DOCKER_BUILD_VARIANTS=default DOCKER_TARGETS="docker.proxyv2" make docker -build-istio: prebuild build-pilot - cd external/istio; BUILD_WITH_CONTAINER=1 BUILDX_PLATFORM=true DOCKER_BUILD_VARIANTS=default DOCKER_TARGETS="docker.pilot" make docker +build-gateway-local: prebuild external/package/envoy-amd64.tar.gz external/package/envoy-arm64.tar.gz build-pilot + cd external/istio; BUILD_WITH_CONTAINER=1 BUILDX_PLATFORM=false DOCKER_BUILD_VARIANTS=default DOCKER_TARGETS="docker.proxyv2" make docker -build-wasmplugins: +build-istio: prebuild build-pilot + cd external/istio; BUILD_WITH_CONTAINER=1 BUILDX_PLATFORM=true DOCKER_BUILD_VARIANTS=default DOCKER_TARGETS="docker.pilot" make docker + +build-istio-local: prebuild build-pilot + cd external/istio; BUILD_WITH_CONTAINER=1 BUILDX_PLATFORM=false DOCKER_BUILD_VARIANTS=default DOCKER_TARGETS="docker.pilot" make docker + +build-wasmplugins: ./tools/hack/build-wasm-plugins.sh pre-install: diff --git a/istio/1.12/patches/istio/20230922-gateway-class.patch b/istio/1.12/patches/istio/20230922-gateway-class.patch new file mode 100644 index 000000000..bd139c391 --- /dev/null +++ b/istio/1.12/patches/istio/20230922-gateway-class.patch @@ -0,0 +1,14 @@ +diff -Naur istio/pilot/pkg/config/kube/gateway/conversion.go istio_new/pilot/pkg/config/kube/gateway/conversion.go +--- istio/pilot/pkg/config/kube/gateway/conversion.go 2023-09-22 11:06:50.400535200 +0800 ++++ istio_new/pilot/pkg/config/kube/gateway/conversion.go 2023-09-22 11:07:52.954982700 +0800 +@@ -37,8 +37,8 @@ + ) + + const ( +- DefaultClassName = "istio" +- ControllerName = "istio.io/gateway-controller" ++ DefaultClassName = "higress" ++ ControllerName = "higress.io/gateway-controller" + ) + + // KubernetesResources stores all inputs to our conversion