Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove grpc-client-nginx-module #370

Merged
merged 3 commits into from
Feb 21, 2024
Merged

fix: remove grpc-client-nginx-module #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e41e092
fix: remove grpc-client-module
sheharyaar Feb 8, 2024
44829d5
fix: remove grpc comments
sheharyaar Feb 18, 2024
47e52bf
Merge remote-tracking branch 'origin/master' into remove-grpc-client
sheharyaar Feb 20, 2024
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
20 changes: 1 addition & 19 deletions build-apisix-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$version" == "latest" ]; then
apisix_nginx_module_ver="main"
wasm_nginx_module_ver="main"
lua_var_nginx_module_ver="master"
grpc_client_nginx_module_ver="main"
lua_resty_events_ver="main"
debug_args="--with-debug"
OR_PREFIX=${OR_PREFIX:="/usr/local/openresty-debug"}
Expand All @@ -25,7 +24,6 @@ else
apisix_nginx_module_ver="1.15.0"
wasm_nginx_module_ver="0.6.5"
lua_var_nginx_module_ver="v0.5.3"
grpc_client_nginx_module_ver="v0.4.4"
lua_resty_events_ver="0.2.0"
debug_args=${debug_args:-}
OR_PREFIX=${OR_PREFIX:="/usr/local/openresty"}
Expand Down Expand Up @@ -79,14 +77,6 @@ else
lua-var-nginx-module-${lua_var_nginx_module_ver}
fi

if [ "$repo" == grpc-client-nginx-module ]; then
cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
else
git clone --depth=1 -b $grpc_client_nginx_module_ver \
https://github.com/api7/grpc-client-nginx-module \
grpc-client-nginx-module-${grpc_client_nginx_module_ver}
fi

if [ "$repo" == lua-resty-events ]; then
cp -r "$prev_workdir" ./lua-resty-events-${lua_resty_events_ver}
else
Expand All @@ -111,9 +101,6 @@ cc_opt=${cc_opt:-}
ld_opt=${ld_opt:-}
luajit_xcflags=${luajit_xcflags:="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT"}
no_pool_patch=${no_pool_patch:-}
# TODO: remove old NGX_HTTP_GRPC_CLI_ENGINE_PATH once we have released a new
# version of grpc-client-nginx-module
grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_HTTP_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so"

cd openresty-${OPENRESTY_VERSION} || exit 1

Expand All @@ -139,7 +126,7 @@ else
fi

./configure --prefix="$OR_PREFIX" \
--with-cc-opt="-DAPISIX_BASE_VER=$version $grpc_engine_path $cc_opt" \
--with-cc-opt="-DAPISIX_BASE_VER=$version $cc_opt" \
--with-ld-opt="-Wl,-rpath,$OR_PREFIX/wasmtime-c-api/lib $ld_opt" \
$debug_args \
--add-module=../mod_dubbo-${mod_dubbo_ver} \
Expand All @@ -149,7 +136,6 @@ fi
--add-module=../apisix-nginx-module-${apisix_nginx_module_ver}/src/meta \
--add-module=../wasm-nginx-module-${wasm_nginx_module_ver} \
--add-module=../lua-var-nginx-module-${lua_var_nginx_module_ver} \
--add-module=../grpc-client-nginx-module-${grpc_client_nginx_module_ver} \
--add-module=../lua-resty-events-${lua_resty_events_ver} \
--with-poll_module \
--with-pcre-jit \
Expand Down Expand Up @@ -193,10 +179,6 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
cd ..

cd grpc-client-nginx-module-${grpc_client_nginx_module_ver} || exit 1
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
cd ..

cd lua-resty-events-${lua_resty_events_ver} || exit 1
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
cd ..
Expand Down
19 changes: 1 addition & 18 deletions build-apisix-runtime.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ mod_dubbo_ver="1.0.2"
apisix_nginx_module_ver="1.15.0"
wasm_nginx_module_ver="0.6.5"
lua_var_nginx_module_ver="v0.5.3"
grpc_client_nginx_module_ver="v0.4.4"
lua_resty_events_ver="0.2.0"


Expand Down Expand Up @@ -128,14 +127,6 @@ else
lua-var-nginx-module-${lua_var_nginx_module_ver}
fi

if [ "$repo" == grpc-client-nginx-module ]; then
cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
else
git clone --depth=1 -b $grpc_client_nginx_module_ver \
https://github.com/api7/grpc-client-nginx-module \
grpc-client-nginx-module-${grpc_client_nginx_module_ver}
fi

cd ngx_multi_upstream_module-${ngx_multi_upstream_module_ver} || exit 1
./patch.sh ../openresty-${OPENRESTY_VERSION}
cd ..
Expand All @@ -151,9 +142,6 @@ cd ..

luajit_xcflags=${luajit_xcflags:="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT"}
no_pool_patch=${no_pool_patch:-}
# TODO: remove old NGX_HTTP_GRPC_CLI_ENGINE_PATH once we have released a new
# version of grpc-client-nginx-module
grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_HTTP_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so"

cd openresty-${OPENRESTY_VERSION} || exit 1

Expand All @@ -171,7 +159,7 @@ fi


./configure --prefix="$OR_PREFIX" \
--with-cc-opt="-DAPISIX_RUNTIME_VER=$runtime_version $grpc_engine_path $cc_opt" \
--with-cc-opt="-DAPISIX_RUNTIME_VER=$runtime_version $cc_opt" \
--with-ld-opt="-Wl,-rpath,$OR_PREFIX/wasmtime-c-api/lib $ld_opt" \
$debug_args \
--add-module=../mod_dubbo-${mod_dubbo_ver} \
Expand All @@ -181,7 +169,6 @@ fi
--add-module=../apisix-nginx-module-${apisix_nginx_module_ver}/src/meta \
--add-module=../wasm-nginx-module-${wasm_nginx_module_ver} \
--add-module=../lua-var-nginx-module-${lua_var_nginx_module_ver} \
--add-module=../grpc-client-nginx-module-${grpc_client_nginx_module_ver} \
--add-module=../lua-resty-events-${lua_resty_events_ver} \
--with-poll_module \
--with-pcre-jit \
Expand Down Expand Up @@ -232,10 +219,6 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
cd ..

cd grpc-client-nginx-module-${grpc_client_nginx_module_ver} || exit 1
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
cd ..

# package etcdctl
ETCD_ARCH="amd64"
ETCD_VERSION=${ETCD_VERSION:-'3.5.4'}
Expand Down
Loading