Skip to content

feat: add nginx upstream check module to openresty #82

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

Merged
merged 9 commits into from
Mar 17, 2025
Merged

feat: add nginx upstream check module to openresty #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d6a44c9
feat: add nginx upstream check module to openresty
mishamilovidov Nov 19, 2024
9b8526f
feat: add upstreams dynamic env var
mishamilovidov Nov 25, 2024
35192e5
fix: update env var to reflect active-active
mishamilovidov Nov 25, 2024
a7613a6
fix: rename to active_active
mishamilovidov Nov 25, 2024
f953a6d
feat: support three more active-active env vars
mishamilovidov Dec 5, 2024
ce3c990
feat: add active-active env var for apigw token
mishamilovidov Dec 10, 2024
a5b5377
feat: add ns and weight active-active env vars
mishamilovidov Dec 13, 2024
ade1ef4
feat: preserve env when starting the gw
mishamilovidov Dec 13, 2024
5f93dd3
Merge branch 'debian' into RUNNER-7552-add-nginx-upstream-check-module
mishamilovidov Mar 13, 2025
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
13 changes: 10 additions & 3 deletions Dockerfile-debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ ARG _sysconfdir=/etc
ARG _sbindir=/usr/local/sbin

ARG TEST_NGINX_VERSION=0.26
# Docker Build Arguments
ARG RESTY_VERSION="1.21.4.2"

ARG NGINX_UPSTREAM_CHECK_MODULE_VERSION="0.4.0"
ARG NGINX_VERSION="1.21.4"
ARG RESTY_VERSION="${NGINX_VERSION}.2"
ARG RESTY_LUAROCKS_VERSION="3.9.2"

# !!! Do not upgrade RESTY_OPENSSL_VERSION to "3.1.3". It will break the reload with OOM error. Other versions have not been tested.
Expand Down Expand Up @@ -94,9 +96,14 @@ RUN cd /tmp \
RUN cd /tmp \
&& curl -fSLk https://openresty.org/download/openresty-${RESTY_VERSION}.tar.gz -o openresty-${RESTY_VERSION}.tar.gz \
&& tar xzf openresty-${RESTY_VERSION}.tar.gz \
&& cd openresty-${RESTY_VERSION} \
&& cd openresty-${RESTY_VERSION}/bundle/nginx-${NGINX_VERSION} \
&& curl -fSLk https://github.com/yaoweibin/nginx_upstream_check_module/archive/refs/tags/v${NGINX_UPSTREAM_CHECK_MODULE_VERSION}.tar.gz -o nginx_upstream_check_module-${NGINX_UPSTREAM_CHECK_MODULE_VERSION}.tar.gz \
&& tar xzf nginx_upstream_check_module-${NGINX_UPSTREAM_CHECK_MODULE_VERSION}.tar.gz \
&& patch -p1 < nginx_upstream_check_module-${NGINX_UPSTREAM_CHECK_MODULE_VERSION}/check_1.20.1+.patch \
&& cd /tmp/openresty-${RESTY_VERSION} \
&& readonly NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
&& ./configure -j${NPROC} ${_RESTY_CONFIG_DEPS} ${RESTY_CONFIG_OPTIONS} ${RESTY_CONFIG_OPTIONS_MORE} \
--add-module=/tmp/openresty-${RESTY_VERSION}/bundle/nginx-${NGINX_VERSION}/nginx_upstream_check_module-${NGINX_UPSTREAM_CHECK_MODULE_VERSION} \
&& make -j${NPROC} \
&& make -j${NPROC} install

Expand Down
4 changes: 3 additions & 1 deletion init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ log_level=${LOG_LEVEL:-warn}
marathon_host=${MARATHON_HOST}
sleep_duration=${MARATHON_POLL_INTERVAL:-5}
force_reload_interval_s=${FORCE_RELOAD_INTERVAL_S:--1}
active_active=${ACTIVE_ACTIVE:-false}

#
# location for a remote /etc/api-gateway folder.
# i.e s3://api-gateway-config
Expand Down Expand Up @@ -123,4 +125,4 @@ else
fi

echo " ... using log level: '${log_level}'. Override it with -e 'LOG_LEVEL=<level>' "
sudo api-gateway -p /usr/local/api-gateway/ -c /etc/api-gateway/api-gateway.conf -g "daemon off; error_log /dev/stderr ${log_level};"
sudo -E api-gateway -p /usr/local/api-gateway/ -c /etc/api-gateway/api-gateway.conf -g "daemon off; error_log /dev/stderr ${log_level}; env ACTIVE_ACTIVE=${active_active};"