(trafficserver) branch master updated: Remove support of matrix parameters in Lua plugin (#11580)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 1867a04e35 Remove support of matrix parameters in Lua plugin (#11580) 1867a04e35 is described below commit 1867a04e35590b6071d07f7ff56541ae44347592 Author: Kit Chan AuthorDate: Mon Jul 22 08:56:28 2024 -0700 Remove support of matrix parameters in Lua plugin (#11580) * Update ts_lua_client_request.cc * Update ts_lua_server_request.cc * Update lua.en.rst --- doc/admin-guide/plugins/lua.en.rst | 83 plugins/lua/ts_lua_client_request.cc | 51 -- plugins/lua/ts_lua_server_request.cc | 56 3 files changed, 190 deletions(-) diff --git a/doc/admin-guide/plugins/lua.en.rst b/doc/admin-guide/plugins/lua.en.rst index bb21160854..cbef95f3c4 100644 --- a/doc/admin-guide/plugins/lua.en.rst +++ b/doc/admin-guide/plugins/lua.en.rst @@ -878,45 +878,6 @@ ts.client_request.set_uri_args ts.client_request.set_uri_args('n=6=7') -:ref:`TOP ` - -ts.client_request.get_uri_params - -**syntax:** *ts.client_request.get_uri_params()* - -**context:** do_remap/do_os_response or do_global_* or later - -**description:** This function can be used to retrieve the client request's parameter string. - -Here is an example: - -:: - -function do_remap() -local query = ts.client_request.get_uri_params() -ts.debug(query) -end - -Then ``GET /st;a=1`` will yield the output: - -``a=1`` - - -:ref:`TOP ` - -ts.client_request.set_uri_params - -**syntax:** *ts.client_request.set_uri_params(PARAMETER_STRING)* - -**context:** do_remap or do_global_* - -**description:** This function can be used to override the client request's parameter string. - -:: - -ts.client_request.set_uri_params('n=6') - - :ref:`TOP ` ts.client_request.get_url @@ -1749,50 +1710,6 @@ ts.server_request.set_uri_args ts.server_request.set_uri_args('n=6=7') -:ref:`TOP ` - -ts.server_request.get_uri_params - -**syntax:** *ts.server_request.get_uri_params()* - -**context:** function @ TS_LUA_HOOK_SEND_REQUEST_HDR hook point or later - -**description:** This function can be used to retrieve the server request's parameter string. - -Here is an example: - -:: - -function send_request() -local query = ts.server_request.get_uri_params() -ts.debug(query) -end - -function do_remap() -ts.hook(TS_LUA_HOOK_SEND_REQUEST_HDR, send_request) -return 0 -end - -Then ``GET /st;a=1`` will yield the output: - -``a=1`` - - -:ref:`TOP ` - -ts.server_request.set_uri_params - -**syntax:** *ts.server_request.set_uri_params(PARAMETER_STRING)* - -**context:** function @ TS_LUA_HOOK_SEND_REQUEST_HDR hook point - -**description:** This function can be used to override the server request's parameter string. - -:: - -ts.server_request.set_uri_params('n=6') - - :ref:`TOP ` ts.server_request.header.HEADER diff --git a/plugins/lua/ts_lua_client_request.cc b/plugins/lua/ts_lua_client_request.cc index 11d66fd375..ef98ad8af7 100644 --- a/plugins/lua/ts_lua_client_request.cc +++ b/plugins/lua/ts_lua_client_request.cc @@ -41,8 +41,6 @@ static int ts_lua_client_request_get_uri(lua_State *L); static int ts_lua_client_request_set_uri(lua_State *L); static int ts_lua_client_request_set_uri_args(lua_State *L); static int ts_lua_client_request_get_uri_args(lua_State *L); -static int ts_lua_client_request_set_uri_params(lua_State *L); -static int ts_lua_client_request_get_uri_params(lua_State *L); static int ts_lua_client_request_get_method(lua_State *L); static int ts_lua_client_request_set_method(lua_State *L); static int ts_lua_client_request_get_version(lua_State *L); @@ -58,7 +56,6 @@ static void ts_lua_inject_client_request_headers_api(lua_State *L); static void ts_lua_inject_client_request_url_api(lua_State *L); static void ts_lua_inject_client_request_uri_api(lua_State *L); static void ts_lua_inject_client_request_args_api(lua_State *L); -static void ts_lua_inject_client_request_params_api(lua_State *L); static void ts_lua_inject_client_request_method_api(lua_State *L); static void ts_lua_inject_client_request_version_api(lua_State *L); static void ts_lua_inject_client_request_body_size_api(lua_State *L); @@ -90,7 +87,6 @@ ts_lua_inject_client_request_api(lua_State *L) ts_lua_inject_client_request_url_api(L); ts_lua_inject_client_request_uri_api(L); ts_lua_inject_client_request_args_api(L); - ts_lua_inject_client_request_params_api(L); ts_lua_inject_client_request_method_api(L); ts_lua_inject_client_request_version_api(L); ts_lua_inject_client_request_body_size_api(L); @@ -699,53 +695,6
(trafficserver) branch master updated: Fix build for Http3frame fuzz test (#11581)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 5be9064114 Fix build for Http3frame fuzz test (#11581) 5be9064114 is described below commit 5be9064114f880d436673ef78d4129fd5032e298 Author: Kit Chan AuthorDate: Fri Jul 19 23:42:49 2024 -0700 Fix build for Http3frame fuzz test (#11581) * Update fuzz_http3frame.cc * Update fuzz_http3frame.cc --- tests/fuzzing/fuzz_http3frame.cc | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/fuzzing/fuzz_http3frame.cc b/tests/fuzzing/fuzz_http3frame.cc index 15dd43091e..cb03656519 100644 --- a/tests/fuzzing/fuzz_http3frame.cc +++ b/tests/fuzzing/fuzz_http3frame.cc @@ -20,6 +20,8 @@ #include "proxy/http3/Http3Frame.h" #include "proxy/http3/Http3Config.h" +#include "proxy/http3/Http3FrameDispatcher.h" +#include "proxy/http3/Http3SettingsHandler.h" #include "records/RecordsConfig.h" #include "tscore/Layout.h" @@ -52,8 +54,14 @@ LLVMFuzzerTestOneInput(const uint8_t *input_data, size_t size_data) static bool Initialized = DoInitialization(); + MIOBuffer *input1 = new_MIOBuffer(BUFFER_SIZE_INDEX_128); + input1->write(input_data, size_data); + IOBufferReader *input_reader1 = input1->alloc_reader(); + Http3FrameFactory frame_factory; - frame_factory.fast_create(input_data, size_data); + frame_factory.fast_create(*input_reader1); + + free_MIOBuffer(input1); return 0; }
(trafficserver) branch master updated (2ef63fa514 -> 84206a8c08)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 2ef63fa514 Use "git rev-parse --absolute-git-dir" in tools scripts. (#11495) add 84206a8c08 wasm plugin: Initialize SanitizationConfig (#11507) No new revisions were added by this update. Summary of changes: plugins/experimental/wasm/lib/include/proxy-wasm/wasm.h | 4 ++-- plugins/experimental/wasm/wasm_main.cc | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-)
(trafficserver-ingress-controller) branch master updated: Upgrade k8s support to 1.30.2 (#237)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 8958f2d Upgrade k8s support to 1.30.2 (#237) 8958f2d is described below commit 8958f2d9eb8f2af2c59367c94fcb21472144a3ef Author: Kit Chan AuthorDate: Mon Jul 1 15:25:59 2024 -0700 Upgrade k8s support to 1.30.2 (#237) * Update build.yml * Update README.md --- .github/workflows/build.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a170a2c..2b0ce6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: uses: manusa/actions-setup-minikube@v2.11.0 with: minikube version: 'v1.33.1' - kubernetes version: 'v1.30.1' + kubernetes version: 'v1.30.2' driver: 'docker' container runtime: 'docker' github token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 91367e7..d060ba7 100644 --- a/README.md +++ b/README.md @@ -40,5 +40,5 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - Other Packages - luasocket 3.0.0 - redis-lua 2.0.4 -- Tested on Minikube 1.33.1 / Kubernetes 1.30.1 +- Tested on Minikube 1.33.1 / Kubernetes 1.30.2
(trafficserver-ingress-controller) branch master updated: Upgrade to alpine linux 3.20.1 (#236)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 498e425 Upgrade to alpine linux 3.20.1 (#236) 498e425 is described below commit 498e425d211d2b376107ecb1676c190ca731c6e1 Author: Kit Chan AuthorDate: Sun Jun 23 18:34:19 2024 -0700 Upgrade to alpine linux 3.20.1 (#236) * Update README.md * Update Dockerfile --- Dockerfile | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d2e066..470fbeb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -FROM alpine:3.20.0 as builder +FROM alpine:3.20.1 as builder RUN apk add --no-cache --virtual .tools \ bzip2 curl nghttp2-libs git automake libtool autoconf make sed file perl openrc openssl @@ -127,7 +127,7 @@ RUN mkdir -p /opt/ats/var/run/redis/ \ # set up ingress log location RUN mkdir -p /opt/ats/var/log/ingress/ -FROM alpine:3.20.0 +FROM alpine:3.20.1 # essential library RUN apk add --no-cache -U \ diff --git a/README.md b/README.md index e002da9..91367e7 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md) ## Dependencies -- Alpine Linux 3.20.0 +- Alpine Linux 3.20.1 - Apache Traffic Server 9.2.4 - OpenResty LuaJIT2 v2.1-20230410 - Go (Version can be found in `GO_VERSION` file found at the base of this repository)
(trafficserver-ingress-controller) branch master updated: Bump urllib3 from 1.26.18 to 1.26.19 in /tests (#235)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 74ca282 Bump urllib3 from 1.26.18 to 1.26.19 in /tests (#235) 74ca282 is described below commit 74ca282b02d9e80c68891b5ea19147d8caecb22e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 18 03:42:18 2024 -0700 Bump urllib3 from 1.26.18 to 1.26.19 in /tests (#235) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.18 to 1.26.19. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/1.26.19/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.18...1.26.19) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 2c13e1a..f9b8e55 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,3 @@ pytest==5.4.3 requests==2.32.0 -urllib3==1.26.18 +urllib3==1.26.19
(trafficserver) branch master updated: Properly handle string return from function (#11442)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 4704ee4945 Properly handle string return from function (#11442) 4704ee4945 is described below commit 4704ee494572305dbfdb5edddc1495b8a0c88d4c Author: Kit Chan AuthorDate: Sun Jun 16 11:41:35 2024 -0700 Properly handle string return from function (#11442) * Properly handle string return from function * Update ats_context.h * Update ats_context.h * Update ats_context.h --- plugins/experimental/wasm/ats_context.h | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/plugins/experimental/wasm/ats_context.h b/plugins/experimental/wasm/ats_context.h index 0574b42ec4..094a654c25 100644 --- a/plugins/experimental/wasm/ats_context.h +++ b/plugins/experimental/wasm/ats_context.h @@ -180,10 +180,10 @@ public: return this; } - std::string - get() + const char * + getDataStrPtr() { -return owned_data_str_; +return owned_data_str_.c_str(); } private: @@ -276,9 +276,12 @@ public: const char * getTransformResult(size_t *body_size) { -std::string s = transform_result_.get(); -*body_size= s.size(); -return s.c_str(); +if (body_size != nullptr) { + *body_size = transform_result_.size(); + return transform_result_.getDataStrPtr(); +} else { + return nullptr; +} } // Metrics
(trafficserver-ingress-controller) branch master updated: Upgrade go to 1.21.11 (#234)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 19f9c73 Upgrade go to 1.21.11 (#234) 19f9c73 is described below commit 19f9c73a8f0da56617b6fb63843c081026076dd7 Author: Kit Chan AuthorDate: Mon Jun 10 05:44:27 2024 +0200 Upgrade go to 1.21.11 (#234) * Update GO_VERSION * Update go.mod --- GO_VERSION | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GO_VERSION b/GO_VERSION index ae7bbdf..88863fd 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.21.10 +1.21.11 diff --git a/go.mod b/go.mod index d66e553..ecf7978 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/apache/trafficserver-ingress-controller -go 1.21.10 +go 1.21.11 require ( github.com/alicebob/miniredis/v2 v2.31.1
(trafficserver) branch master updated: Update Http3Frame.cc - fix Use-of-uninitialized-value error (#11400)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 4d07954652 Update Http3Frame.cc - fix Use-of-uninitialized-value error (#11400) 4d07954652 is described below commit 4d07954652878700269140173a5630ad38c49fa2 Author: Kit Chan AuthorDate: Tue Jun 4 18:20:06 2024 +0200 Update Http3Frame.cc - fix Use-of-uninitialized-value error (#11400) * Update Http3Frame.cc * Update Http3Frame.cc * Update Http3Frame.cc * Update Http3Frame.cc * Update Http3Frame.cc * Update Http3Frame.cc --- src/proxy/http3/Http3Frame.cc | 23 +-- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/proxy/http3/Http3Frame.cc b/src/proxy/http3/Http3Frame.cc index c429919217..96c46f794d 100644 --- a/src/proxy/http3/Http3Frame.cc +++ b/src/proxy/http3/Http3Frame.cc @@ -277,13 +277,24 @@ Http3SettingsFrame::Http3SettingsFrame(const uint8_t *buf, size_t buf_len, uint3 break; } -size_t id_len = QUICVariableInt::size(buf + len); -uint16_t id = QUICIntUtil::read_QUICVariableInt(buf + len, buf_len - len); -len += id_len; +size_t id_len = QUICVariableInt::size(buf + len); +if ((len + id_len) >= +buf_len) { // if the id is larger than the buffer or at the boundary of the buffer (i.e. no value), it is invalid + this->_error_code = Http3ErrorCode::H3_SETTINGS_ERROR; + this->_error_reason = reinterpret_cast("invalid SETTINGS frame"); + break; +} +uint16_t id = QUICIntUtil::read_QUICVariableInt(buf + len, buf_len - len); +len += id_len; -size_t value_len = QUICVariableInt::size(buf + len); -uint64_t value = QUICIntUtil::read_QUICVariableInt(buf + len, buf_len - len); -len+= value_len; +size_t value_len = QUICVariableInt::size(buf + len); +if ((len + value_len) > buf_len) { + this->_error_code = Http3ErrorCode::H3_SETTINGS_ERROR; + this->_error_reason = reinterpret_cast("invalid SETTINGS frame"); + break; +} +uint64_t value = QUICIntUtil::read_QUICVariableInt(buf + len, buf_len - len); +len+= value_len; // Ignore any SETTINGS identifier it does not understand. bool ignore = true;
(trafficserver-ingress-controller) branch master updated: Upgrade for minikube/k8s 1.33.1/1.30.1 (#233)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new c2eea74 Upgrade for minikube/k8s 1.33.1/1.30.1 (#233) c2eea74 is described below commit c2eea749d8b3605a3d2ce006c6bd93f1ebd69bf1 Author: Kit Chan AuthorDate: Tue May 28 09:37:34 2024 -0700 Upgrade for minikube/k8s 1.33.1/1.30.1 (#233) * Update build.yml * Update README.md --- .github/workflows/build.yml | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e776014..a170a2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,8 +30,8 @@ jobs: - name: Setup Minikube uses: manusa/actions-setup-minikube@v2.11.0 with: - minikube version: 'v1.33.0' - kubernetes version: 'v1.30.0' + minikube version: 'v1.33.1' + kubernetes version: 'v1.30.1' driver: 'docker' container runtime: 'docker' github token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 3fe23cd..e002da9 100644 --- a/README.md +++ b/README.md @@ -40,5 +40,5 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - Other Packages - luasocket 3.0.0 - redis-lua 2.0.4 -- Tested on Minikube 1.33.0 / Kubernetes 1.30.0 +- Tested on Minikube 1.33.1 / Kubernetes 1.30.1
(trafficserver-ingress-controller) branch master updated: Update README.md (#232)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new eef17d7 Update README.md (#232) eef17d7 is described below commit eef17d75c804ca5e0aac0f1370735cc05d0a1e85 Author: Kit Chan AuthorDate: Sun May 26 17:48:51 2024 -0700 Update README.md (#232) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 547eb27..3fe23cd 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con ## Dependencies - Alpine Linux 3.20.0 - Apache Traffic Server 9.2.4 -- LuaJIT 2.0.4 +- OpenResty LuaJIT2 v2.1-20230410 - Go (Version can be found in `GO_VERSION` file found at the base of this repository) - Other Packages - luasocket 3.0.0
(trafficserver-ingress-controller) branch master updated: Update Dockerfile (#230)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new af7e140 Update Dockerfile (#230) af7e140 is described below commit af7e140e88112a9bb07fe15660a331721878192d Author: Kit Chan AuthorDate: Thu May 23 14:35:06 2024 -0700 Update Dockerfile (#230) --- Dockerfile | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2f6e05f..6d2e066 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,12 +24,14 @@ RUN apk add --no-cache --virtual .tools \ RUN apk add --no-cache --virtual .ats-build-deps \ build-base openssl-dev tcl-dev pcre-dev zlib-dev \ linux-headers libunwind-dev \ - brotli-dev jansson-dev luajit-dev readline-dev geoip-dev libxml2-dev + brotli-dev jansson-dev readline-dev geoip-dev libxml2-dev RUN apk add --no-cache --virtual .ats-extra-build-deps --repository https://dl-cdn.alpinelinux.org/alpine/edge/community hwloc-dev RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.16/main libexecinfo-dev +RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.19/main luajit-dev=2.1_p20230410-r3 + RUN addgroup -Sg 1000 ats RUN adduser -S -D -H -u 1000 -h /tmp -s /sbin/nologin -G ats -g ats ats @@ -139,7 +141,6 @@ RUN apk add --no-cache -U \ openssl \ brotli \ jansson \ -luajit \ libunwind \ readline \ geoip \ @@ -154,6 +155,8 @@ RUN apk add --no-cache -U --repository https://dl-cdn.alpinelinux.org/alpine/edg RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.16/main libexecinfo +RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.19/main luajit=2.1_p20230410-r3 + # symlink for luajit RUN ln -sf /usr/lib/libluajit-5.1.so.2.1.0 /usr/lib/libluajit-5.1.so
(trafficserver-ingress-controller) branch master updated: Upgrade to alpine linux 3.20.0 (#229)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 26c8979 Upgrade to alpine linux 3.20.0 (#229) 26c8979 is described below commit 26c8979c7fd4105d46ae916b4853281e0b563447 Author: Kit Chan AuthorDate: Thu May 23 11:13:04 2024 -0700 Upgrade to alpine linux 3.20.0 (#229) * Update Dockerfile * Update README.md --- Dockerfile | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3f64b2..2f6e05f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -FROM alpine:3.19.1 as builder +FROM alpine:3.20.0 as builder RUN apk add --no-cache --virtual .tools \ bzip2 curl nghttp2-libs git automake libtool autoconf make sed file perl openrc openssl @@ -125,7 +125,7 @@ RUN mkdir -p /opt/ats/var/run/redis/ \ # set up ingress log location RUN mkdir -p /opt/ats/var/log/ingress/ -FROM alpine:3.19.1 +FROM alpine:3.20.0 # essential library RUN apk add --no-cache -U \ diff --git a/README.md b/README.md index 0a2d6d6..547eb27 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md) ## Dependencies -- Alpine Linux 3.19.1 +- Alpine Linux 3.20.0 - Apache Traffic Server 9.2.4 - LuaJIT 2.0.4 - Go (Version can be found in `GO_VERSION` file found at the base of this repository)
(trafficserver-ingress-controller) branch master updated: More cleanup on github actions (#228)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new acfec4b More cleanup on github actions (#228) acfec4b is described below commit acfec4b860d7990813f33e418e945ca9e407f2b6 Author: Kit Chan AuthorDate: Wed May 22 08:24:33 2024 -0700 More cleanup on github actions (#228) * Update build.yml * Update test.yml * Update test.yml --- .github/workflows/build.yml | 8 .github/workflows/test.yml | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2466f6..e776014 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: - name: Log in to the Container registry if: github.repository == 'apache/trafficserver-ingress-controller' -uses: docker/login-action@v2 +uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -81,7 +81,7 @@ jobs: - name: Extract metadata (tags, labels) for Docker if: github.repository == 'apache/trafficserver-ingress-controller' id: meta -uses: docker/metadata-action@v4 +uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | @@ -89,7 +89,7 @@ jobs: - name: Build and push Docker image if: github.repository == 'apache/trafficserver-ingress-controller' -uses: docker/build-push-action@v3 +uses: docker/build-push-action@v5 with: context: . push: true @@ -107,6 +107,6 @@ jobs: - name: Upload Trivy scan results to GitHub Security tab if: github.repository == 'apache/trafficserver-ingress-controller' -uses: github/codeql-action/upload-sarif@v2 +uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5c75de6..a530029 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,20 +24,20 @@ jobs: steps: - name: Check out code into the Go module directory - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: go-version - run: echo "::set-output name=value::$(cat GO_VERSION)" + run: echo "value=$(cat GO_VERSION)" >>$GITHUB_OUTPUT id: go-version - name: Set up Go 1.x - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: go-version: ${{ steps.go-version.outputs.value }} id: go # commit for v8.0.0 -- uses: leafo/gh-actions-lua@ea0ae38722c0b45aa4e770f7c4a650c6b26800d0 +- uses: leafo/gh-actions-lua@v10 with: luaVersion: "5.1.5"
(trafficserver-ingress-controller) branch master updated: --- (#227)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new b3be6e5 --- (#227) b3be6e5 is described below commit b3be6e5d6b59cf21fde817404d236213380092d2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 21 08:34:25 2024 -0700 --- (#227) updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 8270d34..2c13e1a 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,3 @@ pytest==5.4.3 -requests==2.31.0 +requests==2.32.0 urllib3==1.26.18
(trafficserver-ingress-controller) branch master updated: More Cleanup on github actions (#226)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new dd1d0b0 More Cleanup on github actions (#226) dd1d0b0 is described below commit dd1d0b0bc6b45f5c07c611e882b5df3608039104 Author: Kit Chan AuthorDate: Tue May 21 06:59:10 2024 -0700 More Cleanup on github actions (#226) * Update go.mod.yml * Update go.vet.yml * Update golangci-lint.yml * Update trivy.yml --- .github/workflows/go.mod.yml| 4 ++-- .github/workflows/go.vet.yml| 4 ++-- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/trivy.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/go.mod.yml b/.github/workflows/go.mod.yml index a26fcce..e63fb51 100644 --- a/.github/workflows/go.mod.yml +++ b/.github/workflows/go.mod.yml @@ -40,9 +40,9 @@ jobs: - name: Checkout uses: actions/checkout@master - name: go-version - run: echo "::set-output name=value::$(cat GO_VERSION)" + run: echo "value=$(cat GO_VERSION)" >>$GITHUB_OUTPUT id: go-version -- uses: actions/setup-go@v2 +- uses: actions/setup-go@v5 with: go-version: ${{ steps.go-version.outputs.value }} # The Go version to download (if necessary) and use. - name: go mod diff --git a/.github/workflows/go.vet.yml b/.github/workflows/go.vet.yml index 3e2c0b1..1a8f139 100644 --- a/.github/workflows/go.vet.yml +++ b/.github/workflows/go.vet.yml @@ -40,9 +40,9 @@ jobs: - name: Checkout uses: actions/checkout@master - name: go-version - run: echo "::set-output name=value::$(cat GO_VERSION)" + run: echo "value=$(cat GO_VERSION)" >>$GITHUB_OUTPUT id: go-version -- uses: actions/setup-go@v2 +- uses: actions/setup-go@v5 with: go-version: ${{ steps.go-version.outputs.value }} # The Go version to download (if necessary) and use. - name: go vet diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index f75639a..678954d 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -46,7 +46,7 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - name: go-version -run: echo "::set-output name=value::$(cat GO_VERSION)" +run: echo "value=$(cat GO_VERSION)" >>$GITHUB_OUTPUT id: go-version - uses: actions/setup-go@v5 with: diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 49a5849..a0a41a6 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -32,7 +32,7 @@ jobs: runs-on: "ubuntu-22.04" steps: - name: Checkout -uses: actions/checkout@v3 +uses: actions/checkout@v4 - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master @@ -42,6 +42,6 @@ jobs: output: 'trivy-results.sarif' - name: Upload Trivy scan results to GitHub Security tab -uses: github/codeql-action/upload-sarif@v2 +uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif'
(trafficserver-ingress-controller) branch master updated: Update codeql-analysis.yml (#225)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 3bcafd4 Update codeql-analysis.yml (#225) 3bcafd4 is described below commit 3bcafd40276ee653b13de7a5edda50085ba36f09 Author: Kit Chan AuthorDate: Sun May 19 23:35:14 2024 -0700 Update codeql-analysis.yml (#225) --- .github/workflows/codeql-analysis.yml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a2c47e2..1e5a15f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,11 +50,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # âšī¸ Command-line programs to run using the OS shell. # ī See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -81,4 +81,4 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3
(trafficserver-ingress-controller) branch master updated: Update go.fmt.yml (#224)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 5c2cb1b Update go.fmt.yml (#224) 5c2cb1b is described below commit 5c2cb1bd58f7b32a5cc079d1f6717c41e3c7bc7c Author: Kit Chan AuthorDate: Fri May 17 10:44:56 2024 -0700 Update go.fmt.yml (#224) --- .github/workflows/go.fmt.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.fmt.yml b/.github/workflows/go.fmt.yml index e87dc36..3c61027 100644 --- a/.github/workflows/go.fmt.yml +++ b/.github/workflows/go.fmt.yml @@ -40,9 +40,9 @@ jobs: - name: Checkout uses: actions/checkout@master - name: go-version - run: echo "::set-output name=value::$(cat GO_VERSION)" + run: echo "value=$(cat GO_VERSION)" >>$GITHUB_OUTPUT id: go-version -- uses: actions/setup-go@v2 +- uses: actions/setup-go@v5 with: go-version: ${{ steps.go-version.outputs.value }} # The Go version to download (if necessary) and use. - name: go fmt
(trafficserver-ingress-controller) branch master updated: Upgrade to go 1.21.10 (#223)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new b6231f0 Upgrade to go 1.21.10 (#223) b6231f0 is described below commit b6231f05e17c96138fa8d2009e4cbb7620de81c6 Author: Kit Chan AuthorDate: Mon May 13 02:50:49 2024 -0700 Upgrade to go 1.21.10 (#223) * Update GO_VERSION * Update go.mod --- GO_VERSION | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GO_VERSION b/GO_VERSION index f124bfa..ae7bbdf 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.21.9 +1.21.10 diff --git a/go.mod b/go.mod index ff9fcf8..d66e553 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/apache/trafficserver-ingress-controller -go 1.21.9 +go 1.21.10 require ( github.com/alicebob/miniredis/v2 v2.31.1
(trafficserver-ingress-controller) branch master updated: Update Dockerfile (#222)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new f03ccca Update Dockerfile (#222) f03ccca is described below commit f03cccabfce53957815323c8e2011e52c440a3de Author: Kit Chan AuthorDate: Sun May 12 11:51:01 2024 -0700 Update Dockerfile (#222) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4d61768..b3f64b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -143,7 +143,7 @@ RUN apk add --no-cache -U \ libunwind \ readline \ geoip \ -redis=7.0.15-r0 \ +redis \ tcl \ openrc \ inotify-tools \
(trafficserver-ingress-controller) branch master updated: Upgrades to alpine linux 3.19.1 (#221)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 9acb74e Upgrades to alpine linux 3.19.1 (#221) 9acb74e is described below commit 9acb74ebcb509fe39ccaa79aefcff1fa1a931cd6 Author: Kit Chan AuthorDate: Sun May 12 11:40:13 2024 -0700 Upgrades to alpine linux 3.19.1 (#221) * Update Dockerfile * Update README.md --- Dockerfile | 19 +++ README.md | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff14a58..4d61768 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,19 +15,21 @@ # limitations under the License. # -FROM alpine:3.16.9 as builder +FROM alpine:3.19.1 as builder RUN apk add --no-cache --virtual .tools \ - bzip2 curl nghttp2-libs=1.47.0-r2 git automake libtool autoconf make sed file perl openrc openssl=1.1.1w-r1 + bzip2 curl nghttp2-libs git automake libtool autoconf make sed file perl openrc openssl # ATS dependencies RUN apk add --no-cache --virtual .ats-build-deps \ - build-base openssl-dev=1.1.1w-r1 tcl-dev pcre-dev zlib-dev \ - libexecinfo-dev linux-headers libunwind-dev \ + build-base openssl-dev tcl-dev pcre-dev zlib-dev \ + linux-headers libunwind-dev \ brotli-dev jansson-dev luajit-dev readline-dev geoip-dev libxml2-dev RUN apk add --no-cache --virtual .ats-extra-build-deps --repository https://dl-cdn.alpinelinux.org/alpine/edge/community hwloc-dev +RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.16/main libexecinfo-dev + RUN addgroup -Sg 1000 ats RUN adduser -S -D -H -u 1000 -h /tmp -s /sbin/nologin -G ats -g ats ats @@ -123,25 +125,24 @@ RUN mkdir -p /opt/ats/var/run/redis/ \ # set up ingress log location RUN mkdir -p /opt/ats/var/log/ingress/ -FROM alpine:3.16.9 +FROM alpine:3.19.1 # essential library RUN apk add --no-cache -U \ bash \ build-base \ curl \ -nghttp2-libs=1.47.0-r2 \ +nghttp2-libs \ ca-certificates \ pcre \ zlib \ -openssl=1.1.1w-r1 \ +openssl \ brotli \ jansson \ luajit \ libunwind \ readline \ geoip \ -libexecinfo \ redis=7.0.15-r0 \ tcl \ openrc \ @@ -151,6 +152,8 @@ RUN apk add --no-cache -U \ RUN apk add --no-cache -U --repository https://dl-cdn.alpinelinux.org/alpine/edge/community hwloc +RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.16/main libexecinfo + # symlink for luajit RUN ln -sf /usr/lib/libluajit-5.1.so.2.1.0 /usr/lib/libluajit-5.1.so diff --git a/README.md b/README.md index d053928..0a2d6d6 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md) ## Dependencies -- Alpine Linux 3.16.9 +- Alpine Linux 3.19.1 - Apache Traffic Server 9.2.4 - LuaJIT 2.0.4 - Go (Version can be found in `GO_VERSION` file found at the base of this repository)
(trafficserver-ingress-controller) branch master updated: Update README.md (#220)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 8a44b09 Update README.md (#220) 8a44b09 is described below commit 8a44b09b200be450c20033093f0c97dd3312b837 Author: Kit Chan AuthorDate: Sat May 11 00:00:08 2024 -0600 Update README.md (#220) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90e81a0..d053928 100644 --- a/README.md +++ b/README.md @@ -40,5 +40,5 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - Other Packages - luasocket 3.0.0 - redis-lua 2.0.4 -- Tested on Minikube 1.30.1 / Kubernetes 1.27.11 +- Tested on Minikube 1.33.0 / Kubernetes 1.30.0
(trafficserver-ingress-controller) branch master updated: Update build.yml (#219)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 7e0ce6c Update build.yml (#219) 7e0ce6c is described below commit 7e0ce6c553111f1a13455de71313da64aaeecd73 Author: Kit Chan AuthorDate: Fri May 10 18:44:05 2024 -0600 Update build.yml (#219) --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1156831..f2466f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,10 +28,10 @@ jobs: submodules: 'true' - name: Setup Minikube -uses: manusa/actions-setup-minikube@v2.10.0 +uses: manusa/actions-setup-minikube@v2.11.0 with: - minikube version: 'v1.30.1' - kubernetes version: 'v1.27.11' + minikube version: 'v1.33.0' + kubernetes version: 'v1.30.0' driver: 'docker' container runtime: 'docker' github token: ${{ secrets.GITHUB_TOKEN }}
(trafficserver) branch master updated (7334b7f635 -> 1d7cad12fb)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 7334b7f635 Send EOS event when QUIC connection becomes draining state (#11317) add 1d7cad12fb Minor document change for lua plugin (#11322) No new revisions were added by this update. Summary of changes: doc/admin-guide/plugins/lua.en.rst | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-)
(trafficserver-ingress-controller) branch master updated: More Document Cleanup (#218)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 3c47e81 More Document Cleanup (#218) 3c47e81 is described below commit 3c47e81fc9c0e71eed61f0569fab301518e9281e Author: Kit Chan AuthorDate: Mon May 6 00:08:11 2024 -0700 More Document Cleanup (#218) * Update README.md * Update TUTORIAL.md * Update index.html --- README.md| 1 + docs/TUTORIAL.md | 2 +- docs/index.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5a9d03c..90e81a0 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ ATS Kubernetes Ingress Controller = +[![Project Status: Concept â Minimal or no implementation has been done yet, or the repository is only intended to be a limited example, demo, or proof-of-concept.](https://www.repostatus.org/badges/latest/concept.svg)](https://www.repostatus.org/#concept) ![Test](https://github.com/apache/trafficserver-ingress-controller/actions/workflows/test.yml/badge.svg) ![Build and Integrate](https://github.com/apache/trafficserver-ingress-controller/actions/workflows/build.yml/badge.svg) [![Go Report diff --git a/docs/TUTORIAL.md b/docs/TUTORIAL.md index 32c1672..361662d 100644 --- a/docs/TUTORIAL.md +++ b/docs/TUTORIAL.md @@ -76,4 +76,4 @@ You can adjust the resync period for the controller by providing environment var ### Helm Chart -Helm Chart is provided [here](../charts/ats-ingress/README.md). +An example of Helm Chart is provided [here](../charts/ats-ingress/README.md) and is unsupported for now diff --git a/docs/index.html b/docs/index.html index f0b5199..a256e2e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -16,7 +16,7 @@ Chart repo -https://github.com/apache/trafficserver-ingress-controller;>Apache Traffic Server Ingress Controller Charts Repo +https://github.com/apache/trafficserver-ingress-controller;>Apache Traffic Server Ingress Controller Charts Repo (Unsupported) Point Helm at this repo to see charts.
(trafficserver-ingress-controller) branch master updated: cleanup (#217)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new ed57035 cleanup (#217) ed57035 is described below commit ed57035e6abd7ab7a075a32e9fd0a5a7a240426a Author: Kit Chan AuthorDate: Sun May 5 20:18:20 2024 -0700 cleanup (#217) --- .gitmodules | 3 --- .lgtm.yml | 21 - k8s/images/trafficserver_exporter | 1 - 3 files changed, 25 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9b0ea0a..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "k8s/images/trafficserver_exporter"] - path = k8s/images/trafficserver_exporter - url = https://github.com/gdvalle/trafficserver_exporter.git diff --git a/.lgtm.yml b/.lgtm.yml deleted file mode 100644 index ea135d7..000 --- a/.lgtm.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -extraction: - javascript: -index: - exclude: -- docs diff --git a/k8s/images/trafficserver_exporter b/k8s/images/trafficserver_exporter deleted file mode 16 index dcde0c9..000 --- a/k8s/images/trafficserver_exporter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dcde0c987e1c359cbd5ecf4cf62f4c69671498ab
(trafficserver-ingress-controller) branch master updated: Documentation Updates (#216)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 70e8e27 Documentation Updates (#216) 70e8e27 is described below commit 70e8e27669a4072abc466fd3660aebbf3bb5e3a9 Author: Kit Chan AuthorDate: Sun May 5 00:13:31 2024 -0700 Documentation Updates (#216) * Update README.md * Update TUTORIAL.md * Update TUTORIAL.md * Update TUTORIAL.md * Delete docs/images/datasource-success.png * Delete docs/images/new-datasource.png * Delete docs/images/new-graph.png * Delete k8s/apps directory * Delete k8s/configmaps directory * Delete k8s/ingresses directory * Delete k8s/prometheus directory * Delete k8s/traffic-server directory * Update .gitmodules * Update .gitmodules * Update TUTORIAL.md --- README.md | 7 +- docs/TUTORIAL.md | 150 -- docs/images/datasource-success.png| Bin 103861 -> 0 bytes docs/images/new-datasource.png| Bin 95425 -> 0 bytes docs/images/new-graph.png | Bin 406834 -> 0 bytes k8s/apps/app-deployment.yaml | 147 - k8s/apps/app-service.yaml | 89 -- k8s/configmaps/ats-configmap.yaml | 35 --- k8s/configmaps/fluentd-configmap.yaml | 49 -- k8s/configmaps/prometheus-configmap.yaml | 58 k8s/ingresses/ats-ingress-2.yaml | 50 -- k8s/ingresses/ats-ingress-2s.yaml | 43 - k8s/ingresses/ats-ingress.yaml| 59 k8s/prometheus/ats-stats.yaml | 28 -- k8s/prometheus/prometheus-deployment.yaml | 88 -- k8s/traffic-server/ats-deployment.yaml| 135 --- k8s/traffic-server/ats-ns.yaml| 20 k8s/traffic-server/ats-rbac.yaml | 60 18 files changed, 22 insertions(+), 996 deletions(-) diff --git a/README.md b/README.md index 9275fd5..5a9d03c 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,8 @@ ATS Kubernetes Ingress Controller = -![Test](https://github.com/apache/trafficserver-ingress-controller/workflows/Test/badge.svg) -![Build and Integrate](https://github.com/apache/trafficserver-ingress-controller/workflows/Build%20and%20Integrate/badge.svg) +![Test](https://github.com/apache/trafficserver-ingress-controller/actions/workflows/test.yml/badge.svg) +![Build and Integrate](https://github.com/apache/trafficserver-ingress-controller/actions/workflows/build.yml/badge.svg) [![Go Report Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-controller)](https://goreportcard.com/report/github.com/apache/trafficserver-ingress-controller) @@ -31,7 +31,7 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - [Tutorial](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/TUTORIAL.md) - [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md) -## Versions of Software Used +## Dependencies - Alpine Linux 3.16.9 - Apache Traffic Server 9.2.4 - LuaJIT 2.0.4 @@ -39,4 +39,5 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - Other Packages - luasocket 3.0.0 - redis-lua 2.0.4 +- Tested on Minikube 1.30.1 / Kubernetes 1.27.11 diff --git a/docs/TUTORIAL.md b/docs/TUTORIAL.md index 4f51cee..32c1672 100644 --- a/docs/TUTORIAL.md +++ b/docs/TUTORIAL.md @@ -18,108 +18,25 @@ --> ## Tutorial -- [Requirements](#requirements) -- [Download project](#download-project) -- [Example Walkthrough](#example-walkthrough) - - [Setting Up Proxy](#setting-up-proxy) - - [Setting Up Backend Applications](#setting-up-backend-applications) - - [Checking Results](#checking-results) +- [Usage](#usage) - [ConfigMap](#configmap) - [Namespaces for Ingresses](#namespaces-for-ingresses) - [Snippet](#snippet) - [Ingress Class](#ingress-class) - [Customizing Logging and TLS](#customizing-logging-and-tls) - [Customizing plugins](#customizing-plugins) -- [Logging and Monitoring](#logging-and-monitoring) - - [Fluentd](#fluentd) - - [Prometheus and Grafana](#prometheus-and-grafana) + - [Enabling Controller Debug Log](#enabling-controller-debug-log) + - [Resync Period of Controller](#resync-period-of-controller) +- [Integrating with Fluentd and Prometheus](#integrating-with-fluentd-and-prometheus) - [Helm Chart](#helm-chart) -### Requirements -- Docker -- (Tested on) Kubernetes 1.24.12 (through Minikube 1.25.2) +### Usage -To install Docke
(trafficserver-ingress-controller) branch master updated: Update go.mod (#212)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 71db8cb Update go.mod (#212) 71db8cb is described below commit 71db8cb774b93d8dc439b3d510e6da63e682559f Author: Kit Chan AuthorDate: Sat May 4 18:15:10 2024 -0700 Update go.mod (#212) * Update go.mod * Update golangci-lint.yml * Update .golangci.yaml --- .github/workflows/golangci-lint.yml | 6 +++--- .golangci.yaml | 4 go.mod | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index fc6a266..f75639a 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -44,15 +44,15 @@ jobs: steps: - name: Check out code into the Go module directory -uses: actions/checkout@v3 +uses: actions/checkout@v4 - name: go-version run: echo "::set-output name=value::$(cat GO_VERSION)" id: go-version - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ steps.go-version.outputs.value }} - name: golangci-lint -uses: golangci/golangci-lint-action@v3 +uses: golangci/golangci-lint-action@v5 with: version: latest args: --timeout=10m diff --git a/.golangci.yaml b/.golangci.yaml index 17b9f00..4c90a48 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -18,16 +18,12 @@ linters: disable-all: true enable: -- deadcode - errcheck - gosimple - govet - ineffassign - staticcheck -- structcheck -- typecheck - unused -- varcheck # Options for analysis running. run: diff --git a/go.mod b/go.mod index f85a039..ff9fcf8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/apache/trafficserver-ingress-controller -go 1.21 +go 1.21.9 require ( github.com/alicebob/miniredis/v2 v2.31.1
(trafficserver) branch master updated: Update XPACK.cc to fix use-of-uninitialized-pointer-field case (#11287)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 9ebe5a207b Update XPACK.cc to fix use-of-uninitialized-pointer-field case (#11287) 9ebe5a207b is described below commit 9ebe5a207b9eeac0ca62b46ebe1e3acb258a4bf8 Author: Kit Chan AuthorDate: Tue Apr 30 08:28:12 2024 -0700 Update XPACK.cc to fix use-of-uninitialized-pointer-field case (#11287) * Update XPACK.cc * Update XPACK.cc * Update XPACK.cc * Update XPACK.cc * Update XPACK.cc * Update XPACK.cc * Update XPACK.cc --- src/proxy/hdrs/XPACK.cc | 4 1 file changed, 4 insertions(+) diff --git a/src/proxy/hdrs/XPACK.cc b/src/proxy/hdrs/XPACK.cc index 88d731268a..7ed7bb359d 100644 --- a/src/proxy/hdrs/XPACK.cc +++ b/src/proxy/hdrs/XPACK.cc @@ -473,6 +473,10 @@ XpackDynamicTable::count() const bool XpackDynamicTable::_make_space(uint64_t required_size) { + if (is_empty()) { +// if the table is empty, skip and just check if there is enough space +return required_size <= this->_available; + } uint32_t freed = 0; uint32_t tail = this->_calc_index(this->_entries_tail, 1);
(trafficserver-ingress-controller) branch master updated: Upgrade ATS to 9.2.4 / Go to 1.21.9 (#210)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 4561831 Upgrade ATS to 9.2.4 / Go to 1.21.9 (#210) 4561831 is described below commit 456183155e25f7165b5c955752dfd21817e10e20 Author: Kit Chan AuthorDate: Sun Apr 21 01:24:30 2024 -0700 Upgrade ATS to 9.2.4 / Go to 1.21.9 (#210) * Update Dockerfile * Update GO_VERSION * Update README.md --- Dockerfile | 4 ++-- GO_VERSION | 2 +- README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7170422..ff14a58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,8 +34,8 @@ RUN adduser -S -D -H -u 1000 -h /tmp -s /sbin/nologin -G ats -g ats ats # download and build ATS # patch 2 files due to pthread in musl vs glibc - see https://github.com/apache/trafficserver/pull/7611/files -RUN curl -L https://downloads.apache.org/trafficserver/trafficserver-9.2.3.tar.bz2 | bzip2 -dc | tar xf - \ - && cd trafficserver-9.2.3/ \ +RUN curl -L https://downloads.apache.org/trafficserver/trafficserver-9.2.4.tar.bz2 | bzip2 -dc | tar xf - \ + && cd trafficserver-9.2.4/ \ && sed -i "s/PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP/PTHREAD_RWLOCK_INITIALIZER/" include/tscore/ink_rwlock.h \ && sed -i "s/PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP/PTHREAD_RWLOCK_INITIALIZER/" include/tscpp/util/TsSharedMutex.h \ && autoreconf -if \ diff --git a/GO_VERSION b/GO_VERSION index 8819d01..f124bfa 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.21.7 +1.21.9 diff --git a/README.md b/README.md index e2aef77..9275fd5 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con ## Versions of Software Used - Alpine Linux 3.16.9 -- Apache Traffic Server 9.2.3 +- Apache Traffic Server 9.2.4 - LuaJIT 2.0.4 - Go (Version can be found in `GO_VERSION` file found at the base of this repository) - Other Packages
(trafficserver-ingress-controller) branch master updated: Bump golang.org/x/net from 0.17.0 to 0.23.0 (#209)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new ff16d8e Bump golang.org/x/net from 0.17.0 to 0.23.0 (#209) ff16d8e is described below commit ff16d8eac18ee8fc234d25abbf4e4c4a62c30d50 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 19 09:07:37 2024 -0700 Bump golang.org/x/net from 0.17.0 to 0.23.0 (#209) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.17.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.17.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 go.sum | 16 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index adef650..f85a039 100644 --- a/go.mod +++ b/go.mod @@ -36,11 +36,11 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/yuin/gopher-lua v1.1.0 // indirect - golang.org/x/net v0.17.0 // indirect + golang.org/x/net v0.23.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/term v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/go.sum b/go.sum index f793716..72d0ada 100644 --- a/go.sum +++ b/go.sum @@ -183,8 +183,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= @@ -210,18 +210,18 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/ti
(trafficserver) branch master updated: Update oss-fuzz.sh (#11221)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 759bbbc782 Update oss-fuzz.sh (#11221) 759bbbc782 is described below commit 759bbbc782f784d46ece7cdf57cfe3c617c9187b Author: Kit Chan AuthorDate: Mon Apr 8 09:34:02 2024 -0700 Update oss-fuzz.sh (#11221) --- tests/fuzzing/oss-fuzz.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/fuzzing/oss-fuzz.sh b/tests/fuzzing/oss-fuzz.sh index 22e34d1b96..bd5f711765 100644 --- a/tests/fuzzing/oss-fuzz.sh +++ b/tests/fuzzing/oss-fuzz.sh @@ -65,4 +65,5 @@ if [[ $SANITIZER = undefined ]] then rm -f $OUT/fuzz_http rm -f $OUT/fuzz_hpack +rm -f $OUT/fuzz_http3frame fi
(trafficserver-ingress-controller) branch master updated: Bump express from 4.18.2 to 4.19.2 in /k8s/images/node-app-2 (#207)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 59136d0 Bump express from 4.18.2 to 4.19.2 in /k8s/images/node-app-2 (#207) 59136d0 is described below commit 59136d00adb7c6d4ebd961d379497436b25bcfa4 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Mar 28 21:37:01 2024 +0100 Bump express from 4.18.2 to 4.19.2 in /k8s/images/node-app-2 (#207) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- k8s/images/node-app-2/package-lock.json | 157 ++-- k8s/images/node-app-2/package.json | 2 +- 2 files changed, 111 insertions(+), 48 deletions(-) diff --git a/k8s/images/node-app-2/package-lock.json b/k8s/images/node-app-2/package-lock.json index b9706a7..f706023 100644 --- a/k8s/images/node-app-2/package-lock.json +++ b/k8s/images/node-app-2/package-lock.json @@ -19,12 +19,12 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz;, - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz;, + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "requires": { "bytes": "3.1.2", -"content-type": "~1.0.4", +"content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -32,7 +32,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", -"raw-body": "2.5.1", +"raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" } @@ -43,12 +43,15 @@ "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz;, - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz;, + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "requires": { -"function-bind": "^1.1.1", -"get-intrinsic": "^1.0.2" +"es-define-property": "^1.0.0", +"es-errors": "^1.3.0", +"function-bind": "^1.1.2", +"get-intrinsic": "^1.2.4", +"set-function-length": "^1.2.1" } }, "content-disposition": { @@ -60,14 +63,14 @@ } }, "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz;, - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz;, + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
(trafficserver-ingress-controller) branch master updated: Bump express from 4.18.2 to 4.19.2 in /k8s/images/node-app-1 (#208)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new d0e0f97 Bump express from 4.18.2 to 4.19.2 in /k8s/images/node-app-1 (#208) d0e0f97 is described below commit d0e0f9701f8f7d644a251bb8be829a7b29218dbf Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Mar 28 21:36:34 2024 +0100 Bump express from 4.18.2 to 4.19.2 in /k8s/images/node-app-1 (#208) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- k8s/images/node-app-1/package-lock.json | 157 ++-- k8s/images/node-app-1/package.json | 2 +- 2 files changed, 111 insertions(+), 48 deletions(-) diff --git a/k8s/images/node-app-1/package-lock.json b/k8s/images/node-app-1/package-lock.json index b9706a7..f706023 100644 --- a/k8s/images/node-app-1/package-lock.json +++ b/k8s/images/node-app-1/package-lock.json @@ -19,12 +19,12 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz;, - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz;, + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "requires": { "bytes": "3.1.2", -"content-type": "~1.0.4", +"content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -32,7 +32,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", -"raw-body": "2.5.1", +"raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" } @@ -43,12 +43,15 @@ "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz;, - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz;, + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "requires": { -"function-bind": "^1.1.1", -"get-intrinsic": "^1.0.2" +"es-define-property": "^1.0.0", +"es-errors": "^1.3.0", +"function-bind": "^1.1.2", +"get-intrinsic": "^1.2.4", +"set-function-length": "^1.2.1" } }, "content-disposition": { @@ -60,14 +63,14 @@ } }, "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz;, - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz;, + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
(trafficserver-ingress-controller) branch master updated: Upgrade to alpine linux 3.16.9 (#206)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 2c42f6a Upgrade to alpine linux 3.16.9 (#206) 2c42f6a is described below commit 2c42f6a3b79fe6c4e7f18d6a16851e6e089020ac Author: Kit Chan AuthorDate: Sat Mar 23 07:31:44 2024 +0100 Upgrade to alpine linux 3.16.9 (#206) * Update Dockerfile * Update README.md --- Dockerfile | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b1e5dab..7170422 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -FROM alpine:3.16.8 as builder +FROM alpine:3.16.9 as builder RUN apk add --no-cache --virtual .tools \ bzip2 curl nghttp2-libs=1.47.0-r2 git automake libtool autoconf make sed file perl openrc openssl=1.1.1w-r1 @@ -123,7 +123,7 @@ RUN mkdir -p /opt/ats/var/run/redis/ \ # set up ingress log location RUN mkdir -p /opt/ats/var/log/ingress/ -FROM alpine:3.16.8 +FROM alpine:3.16.9 # essential library RUN apk add --no-cache -U \ diff --git a/README.md b/README.md index c851066..e2aef77 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md) ## Versions of Software Used -- Alpine Linux 3.16.8 +- Alpine Linux 3.16.9 - Apache Traffic Server 9.2.3 - LuaJIT 2.0.4 - Go (Version can be found in `GO_VERSION` file found at the base of this repository)
(trafficserver-ingress-controller) branch master updated: Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 (#205)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 65552f4 Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 (#205) 65552f4 is described below commit 65552f421330e123cb8baed4dba6833a096dac78 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Mar 13 17:08:28 2024 -0700 Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 (#205) Bumps google.golang.org/protobuf from 1.31.0 to 1.33.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 6 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 0779157..adef650 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 4cdecb2..f793716 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= -github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= @@ -269,8 +267,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
(trafficserver) branch master updated (5d6f2f6c05 -> d733ed0eea)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 5d6f2f6c05 Fix a couple misspellings (#11137) add d733ed0eea [Fuzzing] Add fuzzing harness for `HTTP3Frame` (#11128) No new revisions were added by this update. Summary of changes: tests/fuzzing/CMakeLists.txt | 3 ++ .../{fuzz_proxy_protocol.cc => fuzz_http3frame.cc} | 35 +++--- tests/fuzzing/oss-fuzz.sh | 26 +++- 3 files changed, 53 insertions(+), 11 deletions(-) copy tests/fuzzing/{fuzz_proxy_protocol.cc => fuzz_http3frame.cc} (65%)
(trafficserver-ingress-controller) branch master updated: Update build.yml (#204)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new c868d69 Update build.yml (#204) c868d69 is described below commit c868d696dfd6895566e2d321f9841170f5b60ae8 Author: Kit Chan AuthorDate: Sun Mar 3 08:13:16 2024 -0700 Update build.yml (#204) * Update build.yml * Update GO_VERSION * Update go.mod --- .github/workflows/build.yml | 2 +- GO_VERSION | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 698d2d2..1156831 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: uses: manusa/actions-setup-minikube@v2.10.0 with: minikube version: 'v1.30.1' - kubernetes version: 'v1.27.9' + kubernetes version: 'v1.27.11' driver: 'docker' container runtime: 'docker' github token: ${{ secrets.GITHUB_TOKEN }} diff --git a/GO_VERSION b/GO_VERSION index 57807d6..8819d01 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.22.0 +1.21.7 diff --git a/go.mod b/go.mod index e57b9f2..0779157 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/apache/trafficserver-ingress-controller -go 1.22 +go 1.21 require ( github.com/alicebob/miniredis/v2 v2.31.1
(trafficserver-ingress-controller) branch master updated: Update Dockerfile (#202)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 87821b3 Update Dockerfile (#202) 87821b3 is described below commit 87821b39735a87fb733d3298479a97d8176b6d9a Author: Kit Chan AuthorDate: Tue Feb 13 15:44:51 2024 -0800 Update Dockerfile (#202) --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9da22c0..b1e5dab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,8 +75,8 @@ RUN apk add --no-cache --virtual .ingress-build-deps \ # Installing Golang https://github.com/CentOS/CentOS-Dockerfiles/blob/master/golang/centos7/Dockerfile COPY GO_VERSION / RUN go_version=$(cat /GO_VERSION) \ -&& wget https://dl.google.com/go/go${go_version}.src.tar.gz \ -&& rm -rf /opt/ats/go && tar -C /opt/ats -xzf go${go_version}.src.tar.gz && cd /opt/ats/go/src/ && ./make.bash +&& wget https://dl.google.com/go/go${go_version}.linux-amd64.tar.gz \ +&& rm -rf /opt/ats/go && tar -C /opt/ats -xzf go${go_version}.linux-amd64.tar.gz ENV PATH=${PATH}:/opt/ats/go/bin ENV GOPATH="/opt/ats/go/bin"
(trafficserver-ingress-controller) branch master updated: Upgrade to go1.22 (#201)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new e8fc088 Upgrade to go1.22 (#201) e8fc088 is described below commit e8fc088bd4c1f4ff3e40e82c77694f17958e532c Author: Kit Chan AuthorDate: Tue Feb 13 15:16:19 2024 -0800 Upgrade to go1.22 (#201) * Update GO_VERSION * Update go.mod * Update go.sum * Update go.mod * Update go.sum * Update go.mod * Update watcher.go * Update watcher.go --- GO_VERSION | 2 +- go.mod | 40 +- go.sum | 117 +++-- watcher/watcher.go | 10 - 4 files changed, 106 insertions(+), 63 deletions(-) diff --git a/GO_VERSION b/GO_VERSION index 6681c8c..57807d6 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.19.8 +1.22.0 diff --git a/go.mod b/go.mod index ab6d3c3..e57b9f2 100644 --- a/go.mod +++ b/go.mod @@ -1,56 +1,56 @@ module github.com/apache/trafficserver-ingress-controller -go 1.19 +go 1.22 require ( - github.com/alicebob/miniredis/v2 v2.13.0 - github.com/go-redis/redis v6.15.2+incompatible - k8s.io/api v0.24.12 - k8s.io/apimachinery v0.24.12 - k8s.io/client-go v0.24.12 + github.com/alicebob/miniredis/v2 v2.31.1 + github.com/go-redis/redis v6.15.9+incompatible + k8s.io/api v0.27.9 + k8s.io/apimachinery v0.27.9 + k8s.io/client-go v0.27.9 ) require ( github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful/v3 v3.8.0 // indirect + github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect - github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.1 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/google/gnostic v0.6.9 // indirect - github.com/google/go-cmp v0.5.8 // indirect + github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.1.0 // indirect - github.com/google/uuid v1.1.2 // indirect - github.com/imdario/mergo v0.3.5 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/imdario/mergo v0.3.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/onsi/ginkgo v1.16.5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb // indirect + github.com/yuin/gopher-lua v1.1.0 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.6.0 // indirect + golang.org/x/oauth2 v0.7.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.28.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/klog/v2 v2.80.1 // indirect - k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect + k8s.io/klog/v2 v2.90.1 // indirect + k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect - sigs.k8s.io/yaml v1.2.0 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index 8879ad6..4cdecb2 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,12 @@ cloud.google.com/go v0.26.0/go.mod h1
(trafficserver-ingress-controller) branch master updated: Update build.yml (#200)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 609029f Update build.yml (#200) 609029f is described below commit 609029fcc96dc319b8f0740ff550bbc9e3dd85a5 Author: Kit Chan AuthorDate: Mon Jan 29 22:51:26 2024 -0800 Update build.yml (#200) --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82f7fb3..698d2d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,10 +36,10 @@ jobs: container runtime: 'docker' github token: ${{ secrets.GITHUB_TOKEN }} - - name: Set up Python 3.7 -uses: actions/setup-python@v2 + - name: Set up Python 3.8 +uses: actions/setup-python@v5 with: - python-version: '3.7' + python-version: '3.8.18' - name: Build ATS Alpine run: |
(trafficserver-ingress-controller) branch master updated: Update build.yml (#199)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new c8cf0e2 Update build.yml (#199) c8cf0e2 is described below commit c8cf0e20acee00fb67facd3c2227b078375a2a02 Author: Kit Chan AuthorDate: Fri Jan 26 21:29:05 2024 -0800 Update build.yml (#199) --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf2a908..82f7fb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,8 @@ jobs: - name: Build ATS Alpine run: | - docker build -t ats-ingress . + eval $(minikube -p minikube docker-env) + docker build -t ats-ingress . --network=host # - name: Build Exporter #run: docker build -t ats-ingress-exporter k8s/images/trafficserver_exporter/
(trafficserver-ingress-controller) branch master updated: Update build.yml (#198)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 7d6f617 Update build.yml (#198) 7d6f617 is described below commit 7d6f617fe59e4a9b4a47a009987cf271455defc3 Author: Kit Chan AuthorDate: Fri Jan 26 18:17:26 2024 -0800 Update build.yml (#198) --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9896446..cf2a908 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,6 @@ jobs: - name: Build ATS Alpine run: | - eval $(minikube -p minikube docker-env) docker build -t ats-ingress . # - name: Build Exporter
(trafficserver-ingress-controller) branch master updated: Update build.yml (#197)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 98e618d Update build.yml (#197) 98e618d is described below commit 98e618de29fd42b1e9790e3a73bfebca0363a12a Author: Kit Chan AuthorDate: Fri Jan 26 18:07:28 2024 -0800 Update build.yml (#197) --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cfaed9..9896446 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,6 @@ jobs: - name: Build ATS Alpine run: | - export SHELL=/bin/bash eval $(minikube -p minikube docker-env) docker build -t ats-ingress . @@ -52,13 +51,11 @@ jobs: - name: Build App 1 run: | - export SHELL=/bin/bash eval $(minikube -p minikube docker-env) docker build -t node-app-1 k8s/images/node-app-1/ - name: Build App 2 run: | - export SHELL=/bin/bash eval $(minikube -p minikube docker-env) docker build -t node-app-2 k8s/images/node-app-2/
(trafficserver-ingress-controller) branch master updated: Update build.yml (#196)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new c59ef1b Update build.yml (#196) c59ef1b is described below commit c59ef1b46f2def38d4c2e6d43bf07e642b577f83 Author: Kit Chan AuthorDate: Fri Jan 26 17:49:04 2024 -0800 Update build.yml (#196) --- .github/workflows/build.yml | 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 380cae5..4cfaed9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,16 +42,25 @@ jobs: python-version: '3.7' - name: Build ATS Alpine -run: docker build -t ats-ingress . +run: | + export SHELL=/bin/bash + eval $(minikube -p minikube docker-env) + docker build -t ats-ingress . - - name: Build Exporter -run: docker build -t ats-ingress-exporter k8s/images/trafficserver_exporter/ +# - name: Build Exporter +#run: docker build -t ats-ingress-exporter k8s/images/trafficserver_exporter/ - name: Build App 1 -run: docker build -t node-app-1 k8s/images/node-app-1/ +run: | + export SHELL=/bin/bash + eval $(minikube -p minikube docker-env) + docker build -t node-app-1 k8s/images/node-app-1/ - name: Build App 2 -run: docker build -t node-app-2 k8s/images/node-app-2/ +run: | + export SHELL=/bin/bash + eval $(minikube -p minikube docker-env) + docker build -t node-app-2 k8s/images/node-app-2/ - name: Install dependencies run: |
(trafficserver-ingress-controller) branch master updated: Update build.yml (#195)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new f767576 Update build.yml (#195) f767576 is described below commit f7675760afeb9b35e3556efa175edb2124ca7a8b Author: Kit Chan AuthorDate: Fri Jan 26 16:32:41 2024 -0800 Update build.yml (#195) --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52fd993..380cae5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,8 @@ jobs: with: minikube version: 'v1.30.1' kubernetes version: 'v1.27.9' + driver: 'docker' + container runtime: 'docker' github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7
(trafficserver-ingress-controller) branch master updated: Update build.yml (#194)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new d0a4cb9 Update build.yml (#194) d0a4cb9 is described below commit d0a4cb91d875ec41192fac40d75e694315bd5895 Author: Kit Chan AuthorDate: Fri Jan 26 15:24:56 2024 -0800 Update build.yml (#194) --- .github/workflows/build.yml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e97e5c2..52fd993 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,11 +28,11 @@ jobs: submodules: 'true' - name: Setup Minikube -uses: medyagh/setup-minikube@latest +uses: manusa/actions-setup-minikube@v2.10.0 with: - minikube-version: 1.30.1 - kubernetes-version: v1.27.9 - driver: docker + minikube version: 'v1.30.1' + kubernetes version: 'v1.27.9' + github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7 uses: actions/setup-python@v2
(trafficserver-ingress-controller) branch master updated: Debug test failure (#193)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new f3e9b01 Debug test failure (#193) f3e9b01 is described below commit f3e9b0159ac19b411d2e1688b55cac415b19ed4f Author: Kit Chan AuthorDate: Fri Jan 26 15:18:02 2024 -0800 Debug test failure (#193) * Update test_ingress.py * Update build.yml --- .github/workflows/build.yml | 8 tests/suite/test_ingress.py | 17 ++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52fd993..e97e5c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,11 +28,11 @@ jobs: submodules: 'true' - name: Setup Minikube -uses: manusa/actions-setup-minikube@v2.10.0 +uses: medyagh/setup-minikube@latest with: - minikube version: 'v1.30.1' - kubernetes version: 'v1.27.9' - github token: ${{ secrets.GITHUB_TOKEN }} + minikube-version: 1.30.1 + kubernetes-version: v1.27.9 + driver: docker - name: Set up Python 3.7 uses: actions/setup-python@v2 diff --git a/tests/suite/test_ingress.py b/tests/suite/test_ingress.py index d0165b2..7d234a7 100644 --- a/tests/suite/test_ingress.py +++ b/tests/suite/test_ingress.py @@ -46,13 +46,16 @@ def setup_module(module): misc_command('kubectl get all -A') misc_command('kubectl get pod -A -o wide') misc_command('kubectl logs $(kubectl get pod -n trafficserver-test-2 -o name | head -1) -n trafficserver-test-2') -misc_command('kubectl exec $(kubectl get pod -n trafficserver-test-3 -o name | head -1) -n trafficserver-test-3 -- ps auxxx') -misc_command('kubectl exec $(kubectl get pod -n trafficserver-test-3 -o name | head -1) -n trafficserver-test-3 -- curl -v localhost:8080/') -#misc_command('kubectl logs $(kubectl get pod -n trafficserver-test-3 -o name | head -1) -n trafficserver-test-3') -misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get pod -n trafficserver-test-2 -o jsonpath={.items[1].status.podIP}):8080') -#misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get pod -n trafficserver-test-3 -o jsonpath={.items[1].status.podIP}):8080') -misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc1 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080') -#misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc2 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test-2 -o name | head -1) -n trafficserver-test-2 -- ps auxxx') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test-2 -o name | head -1) -n trafficserver-test-2 -- curl -v localhost:8080/app1') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test-2 -o name | head -1) -n trafficserver-test-2 -- curl -v $(kubectl get pod -n trafficserver-test-2 -o jsonpath={.items[0].status.podIP}):8080/app1') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test-3 -o name | head -1) -n trafficserver-test-3 -- curl -v $(kubectl get pod -n trafficserver-test-2 -o jsonpath={.items[0].status.podIP}):8080/app1') + +#misc_command('kubectl logs $(kubectl get pod -n trafficserver-test-3 -o name | head -1) -n trafficserver-test-3') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get pod -n trafficserver-test-2 -o jsonpath={.items[0].status.podIP}):8080/app1') +#misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get pod -n trafficserver-test-3 -o jsonpath={.items[0].status.podIP}):8080/app1') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc1 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080/app1') +#misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc2 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080/app1') def teardown_module(module): kubectl_delete('namespace trafficserver-test-3')
(trafficserver-ingress-controller) branch master updated: Deployment/ Service changes for app in test (#192)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 6a000f6 Deployment/ Service changes for app in test (#192) 6a000f6 is described below commit 6a000f67f0adef8c785b29631813cd129516dcb8 Author: Kit Chan AuthorDate: Fri Jan 26 13:27:58 2024 -0800 Deployment/ Service changes for app in test (#192) * Update app-deployment.yaml * Update app-service.yaml --- tests/data/setup/apps/app-deployment.yaml | 9 - tests/data/setup/apps/app-service.yaml| 6 -- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/data/setup/apps/app-deployment.yaml b/tests/data/setup/apps/app-deployment.yaml index 73a9ff6..934db1d 100644 --- a/tests/data/setup/apps/app-deployment.yaml +++ b/tests/data/setup/apps/app-deployment.yaml @@ -52,6 +52,8 @@ spec: value: app1 ports: - containerPort: 8080 + name: http + protocol: TCP --- apiVersion: apps/v1 kind: Deployment @@ -77,7 +79,8 @@ spec: value: app2 ports: - containerPort: 8080 - + name: http + protocol: TCP --- apiVersion: apps/v1 @@ -104,6 +107,8 @@ spec: value: app1 ports: - containerPort: 8080 + name: http + protocol: TCP --- apiVersion: apps/v1 kind: Deployment @@ -129,3 +134,5 @@ spec: value: app2 ports: - containerPort: 8080 + name: http + protocol: TCP diff --git a/tests/data/setup/apps/app-service.yaml b/tests/data/setup/apps/app-service.yaml index 260c8cf..1c184df 100644 --- a/tests/data/setup/apps/app-service.yaml +++ b/tests/data/setup/apps/app-service.yaml @@ -36,6 +36,7 @@ metadata: spec: ports: - port: 8080 +name: "appsvc1http" protocol: TCP targetPort: 8080 selector: @@ -49,7 +50,7 @@ metadata: spec: ports: - port: 8080 -name: "main" +name: "appsvc2http" protocol: TCP targetPort: 8080 @@ -66,6 +67,7 @@ metadata: spec: ports: - port: 8080 +name: "appsvc1http" protocol: TCP targetPort: 8080 selector: @@ -79,7 +81,7 @@ metadata: spec: ports: - port: 8080 -name: "main" +name: "appsvc2http" protocol: TCP targetPort: 8080
(trafficserver-ingress-controller) branch master updated: Update test_ingress.py (#191)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new c310224 Update test_ingress.py (#191) c310224 is described below commit c310224ec9aae819e9a729103c4fca428bab04fc Author: Kit Chan AuthorDate: Fri Jan 26 11:55:46 2024 -0800 Update test_ingress.py (#191) --- tests/suite/test_ingress.py | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/suite/test_ingress.py b/tests/suite/test_ingress.py index 2c8bf0c..d0165b2 100644 --- a/tests/suite/test_ingress.py +++ b/tests/suite/test_ingress.py @@ -46,11 +46,13 @@ def setup_module(module): misc_command('kubectl get all -A') misc_command('kubectl get pod -A -o wide') misc_command('kubectl logs $(kubectl get pod -n trafficserver-test-2 -o name | head -1) -n trafficserver-test-2') -misc_command('kubectl logs $(kubectl get pod -n trafficserver-test-3 -o name | head -1) -n trafficserver-test-3') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test-3 -o name | head -1) -n trafficserver-test-3 -- ps auxxx') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test-3 -o name | head -1) -n trafficserver-test-3 -- curl -v localhost:8080/') +#misc_command('kubectl logs $(kubectl get pod -n trafficserver-test-3 -o name | head -1) -n trafficserver-test-3') misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get pod -n trafficserver-test-2 -o jsonpath={.items[1].status.podIP}):8080') -misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get pod -n trafficserver-test-3 -o jsonpath={.items[1].status.podIP}):8080') +#misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get pod -n trafficserver-test-3 -o jsonpath={.items[1].status.podIP}):8080') misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc1 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080') -misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc2 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080') +#misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc2 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080') def teardown_module(module): kubectl_delete('namespace trafficserver-test-3')
(trafficserver-ingress-controller) branch master updated: Create apps-rbac.yaml (#190)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 15122c2 Create apps-rbac.yaml (#190) 15122c2 is described below commit 15122c22d1122865dd99f8a71424e161cb6b0bb8 Author: Kit Chan AuthorDate: Fri Jan 26 08:20:40 2024 -0800 Create apps-rbac.yaml (#190) --- tests/data/setup/apps/apps-rbac.yaml | 104 +++ 1 file changed, 104 insertions(+) diff --git a/tests/data/setup/apps/apps-rbac.yaml b/tests/data/setup/apps/apps-rbac.yaml new file mode 100644 index 000..282f691 --- /dev/null +++ b/tests/data/setup/apps/apps-rbac.yaml @@ -0,0 +1,104 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +apiVersion: v1 +kind: Namespace +metadata: + name: trafficserver-test-2 + +--- + +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: trafficserver-test-2 +rules: +- apiGroups: + - '*' + resources: + - ingresses + - secrets + - services + - pods + - namespaces + - replicationcontrollers + - endpoints + - configmaps + verbs: + - get + - list + - watch + +--- + +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: trafficserver-test-2 +subjects: +- kind: ServiceAccount + name: default + namespace: trafficserver-test-2 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: trafficserver-test-2 + +--- + +apiVersion: v1 +kind: Namespace +metadata: + name: trafficserver-test-3 + +--- + +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: trafficserver-test-3 +rules: +- apiGroups: + - '*' + resources: + - ingresses + - secrets + - services + - pods + - namespaces + - replicationcontrollers + - endpoints + - configmaps + verbs: + - get + - list + - watch + +--- + +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: trafficserver-test-3 +subjects: +- kind: ServiceAccount + name: default + namespace: trafficserver-test-3 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: trafficserver-test-3
(trafficserver-ingress-controller) branch master updated: Update test_ingress.py (#189)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new f4231a8 Update test_ingress.py (#189) f4231a8 is described below commit f4231a8cc10acb2853bcf33abf624a24bce505ed Author: Kit Chan AuthorDate: Fri Jan 26 00:19:14 2024 -0800 Update test_ingress.py (#189) --- tests/suite/test_ingress.py | 23 ++- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tests/suite/test_ingress.py b/tests/suite/test_ingress.py index 05fef7f..2c8bf0c 100644 --- a/tests/suite/test_ingress.py +++ b/tests/suite/test_ingress.py @@ -44,8 +44,13 @@ def setup_module(module): kubectl_apply('data/setup/ingresses/') time.sleep(90) misc_command('kubectl get all -A') +misc_command('kubectl get pod -A -o wide') misc_command('kubectl logs $(kubectl get pod -n trafficserver-test-2 -o name | head -1) -n trafficserver-test-2') +misc_command('kubectl logs $(kubectl get pod -n trafficserver-test-3 -o name | head -1) -n trafficserver-test-3') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get pod -n trafficserver-test-2 -o jsonpath={.items[1].status.podIP}):8080') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get pod -n trafficserver-test-3 -o jsonpath={.items[1].status.podIP}):8080') misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc1 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc2 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080') def teardown_module(module): kubectl_delete('namespace trafficserver-test-3') @@ -110,7 +115,7 @@ class TestIngress: def test_basic_routing_edge_app1(self, minikubeip): req_url = "http://; + minikubeip + ":30080/app1" resp = requests.get(req_url, headers={"host": "test.edge.com"}) -misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/squid.log') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/trafficserver/squid.log') assert resp.status_code == 200,\ f"Expected: 200 response code for test_basic_routing" @@ -119,7 +124,7 @@ class TestIngress: def test_basic_routing_media_app1(self, minikubeip): req_url = "http://; + minikubeip + ":30080/app1" resp = requests.get(req_url, headers={"host": "test.media.com"}) -misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/squid.log') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/trafficserver/squid.log') assert resp.status_code == 200,\ f"Expected: 200 response code for test_basic_routing" @@ -128,7 +133,7 @@ class TestIngress: def test_basic_routing_edge_app2(self, minikubeip): req_url = "http://; + minikubeip + ":30080/app2" resp = requests.get(req_url, headers={"host": "test.edge.com"}) -misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/squid.log') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/trafficserver/squid.log') assert resp.status_code == 200,\ f"Expected: 200 response code for test_basic_routing" @@ -137,7 +142,7 @@ class TestIngress: def test_basic_routing_media_app2(self, minikubeip): req_url = "http://; + minikubeip + ":30080/app2" resp = requests.get(req_url, headers={"host": "test.media.com"}) -misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/squid.log') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/trafficserver/squid.log') assert resp.status_code == 200,\ f"Expected: 200 response code for test_basic_routing" @@ -146,7 +151,7 @@ class TestIngress: def test_basic_routing_edge_app2_https(self, minikubeip): req_url = &
(trafficserver-ingress-controller) branch master updated: Add more debug messages (#188)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new ca84374 Add more debug messages (#188) ca84374 is described below commit ca843746882cc0e8cd704a3b827b14f5623b62bf Author: Kit Chan AuthorDate: Thu Jan 25 23:19:20 2024 -0800 Add more debug messages (#188) * Update build.yml * Update test_ingress.py --- .github/workflows/build.yml | 2 +- tests/suite/test_ingress.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 688297b..52fd993 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7 -uses: actions/setup-python@v5 +uses: actions/setup-python@v2 with: python-version: '3.7' diff --git a/tests/suite/test_ingress.py b/tests/suite/test_ingress.py index cd7288a..05fef7f 100644 --- a/tests/suite/test_ingress.py +++ b/tests/suite/test_ingress.py @@ -44,7 +44,8 @@ def setup_module(module): kubectl_apply('data/setup/ingresses/') time.sleep(90) misc_command('kubectl get all -A') -misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc1 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080') +misc_command('kubectl logs $(kubectl get pod -n trafficserver-test-2 -o name | head -1) -n trafficserver-test-2') +misc_command('kubectl exec $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc1 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080') def teardown_module(module): kubectl_delete('namespace trafficserver-test-3')
(trafficserver-ingress-controller) branch master updated: Add debug message to tests (#187)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 0170656 Add debug message to tests (#187) 0170656 is described below commit 017065663f76dfb3b7ad2521840603ff6911535b Author: Kit Chan AuthorDate: Thu Jan 25 22:02:24 2024 -0800 Add debug message to tests (#187) * Update build.yml * Update test_ingress.py --- .github/workflows/build.yml | 6 +++--- tests/suite/test_ingress.py | 10 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08ca155..688297b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,19 +23,19 @@ jobs: steps: - name: Checkout -uses: actions/checkout@v3 +uses: actions/checkout@v4 with: submodules: 'true' - name: Setup Minikube -uses: manusa/actions-setup-minikube@v2.8.0 +uses: manusa/actions-setup-minikube@v2.10.0 with: minikube version: 'v1.30.1' kubernetes version: 'v1.27.9' github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7 -uses: actions/setup-python@v2 +uses: actions/setup-python@v5 with: python-version: '3.7' diff --git a/tests/suite/test_ingress.py b/tests/suite/test_ingress.py index ec11d43..cd7288a 100644 --- a/tests/suite/test_ingress.py +++ b/tests/suite/test_ingress.py @@ -44,6 +44,7 @@ def setup_module(module): kubectl_apply('data/setup/ingresses/') time.sleep(90) misc_command('kubectl get all -A') +misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- curl -v $(kubectl get service/appsvc1 -n trafficserver-test-2 -o jsonpath={.spec.clusterIP}):8080') def teardown_module(module): kubectl_delete('namespace trafficserver-test-3') @@ -108,6 +109,7 @@ class TestIngress: def test_basic_routing_edge_app1(self, minikubeip): req_url = "http://; + minikubeip + ":30080/app1" resp = requests.get(req_url, headers={"host": "test.edge.com"}) +misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/squid.log') assert resp.status_code == 200,\ f"Expected: 200 response code for test_basic_routing" @@ -116,6 +118,7 @@ class TestIngress: def test_basic_routing_media_app1(self, minikubeip): req_url = "http://; + minikubeip + ":30080/app1" resp = requests.get(req_url, headers={"host": "test.media.com"}) +misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/squid.log') assert resp.status_code == 200,\ f"Expected: 200 response code for test_basic_routing" @@ -124,6 +127,7 @@ class TestIngress: def test_basic_routing_edge_app2(self, minikubeip): req_url = "http://; + minikubeip + ":30080/app2" resp = requests.get(req_url, headers={"host": "test.edge.com"}) +misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/squid.log') assert resp.status_code == 200,\ f"Expected: 200 response code for test_basic_routing" @@ -132,6 +136,7 @@ class TestIngress: def test_basic_routing_media_app2(self, minikubeip): req_url = "http://; + minikubeip + ":30080/app2" resp = requests.get(req_url, headers={"host": "test.media.com"}) +misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/squid.log') assert resp.status_code == 200,\ f"Expected: 200 response code for test_basic_routing" @@ -140,6 +145,7 @@ class TestIngress: def test_basic_routing_edge_app2_https(self, minikubeip): req_url = "https://; + minikubeip + ":30443/app2" resp = requests.get(req_url, headers={"host": "test.edge.com"}, verify=False) +misc_command('kubectl exec -it $(kubectl get pod -n trafficserver-test -o name) -n trafficserver-test -- cat /opt/ats/var/log/squid.log') assert resp.status_code == 200,\ f"Expected: 200 response code for test_basic_routing" @@ -149,6 +155,7 @@ class TestIngress: kubectl_apply('data/ats-ingress-update.yaml') req_url = "http://; + minikubeip + ":30080/app2" resp = request
(trafficserver-ingress-controller) branch master updated: Update app-deployment.yaml (#186)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new f5d5a7d Update app-deployment.yaml (#186) f5d5a7d is described below commit f5d5a7de503ae21979105d414a69292ddc1cf77a Author: Kit Chan AuthorDate: Thu Jan 25 19:37:31 2024 -0800 Update app-deployment.yaml (#186) --- tests/data/setup/apps/app-deployment.yaml | 16 1 file changed, 16 deletions(-) diff --git a/tests/data/setup/apps/app-deployment.yaml b/tests/data/setup/apps/app-deployment.yaml index 79ff78d..73a9ff6 100644 --- a/tests/data/setup/apps/app-deployment.yaml +++ b/tests/data/setup/apps/app-deployment.yaml @@ -52,10 +52,6 @@ spec: value: app1 ports: - containerPort: 8080 -resources: - limits: -memory: '150Mi' -cpu: 50m --- apiVersion: apps/v1 kind: Deployment @@ -81,10 +77,6 @@ spec: value: app2 ports: - containerPort: 8080 -resources: - limits: -memory: '150Mi' -cpu: 50m --- @@ -112,10 +104,6 @@ spec: value: app1 ports: - containerPort: 8080 -resources: - limits: -memory: '150Mi' -cpu: 50m --- apiVersion: apps/v1 kind: Deployment @@ -141,7 +129,3 @@ spec: value: app2 ports: - containerPort: 8080 -resources: - limits: -memory: '150Mi' -cpu: 50m
(trafficserver-ingress-controller) branch master updated: Debug test failure in minikube (#185)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 32cf1e7 Debug test failure in minikube (#185) 32cf1e7 is described below commit 32cf1e7bb973047123be9e069b301ee8d33b0396 Author: Kit Chan AuthorDate: Thu Jan 25 17:48:36 2024 -0800 Debug test failure in minikube (#185) * Update Dockerfile * Update test_ingress.py --- Dockerfile | 2 +- tests/suite/test_ingress.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f225fc6..9da22c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -142,7 +142,7 @@ RUN apk add --no-cache -U \ readline \ geoip \ libexecinfo \ -redis \ +redis=7.0.15-r0 \ tcl \ openrc \ inotify-tools \ diff --git a/tests/suite/test_ingress.py b/tests/suite/test_ingress.py index dd05374..ec11d43 100644 --- a/tests/suite/test_ingress.py +++ b/tests/suite/test_ingress.py @@ -43,6 +43,7 @@ def setup_module(module): kubectl_apply('data/setup/apps/') kubectl_apply('data/setup/ingresses/') time.sleep(90) +misc_command('kubectl get all -A') def teardown_module(module): kubectl_delete('namespace trafficserver-test-3')
(trafficserver-ingress-controller) branch master updated: Update build.yml (#184)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new c5361a0 Update build.yml (#184) c5361a0 is described below commit c5361a0b0b32f9174ac6af05e08d68ab1cc4e2d8 Author: Kit Chan AuthorDate: Tue Jan 23 12:30:07 2024 -0800 Update build.yml (#184) --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4245072..08ca155 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,10 +28,10 @@ jobs: submodules: 'true' - name: Setup Minikube -uses: manusa/actions-setup-minikube@v2.7.2 +uses: manusa/actions-setup-minikube@v2.8.0 with: - minikube version: 'v1.28.0' - kubernetes version: 'v1.25.16' + minikube version: 'v1.30.1' + kubernetes version: 'v1.27.9' github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7
(trafficserver) branch master updated: Fix problem with the negation (#10971)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new dc4dc35780 Fix problem with the negation (#10971) dc4dc35780 is described below commit dc4dc35780a923fbe8759994f481250b8486a505 Author: Kit Chan AuthorDate: Sun Jan 14 00:25:36 2024 -0800 Fix problem with the negation (#10971) --- lib/swoc/src/TextView.cc | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/swoc/src/TextView.cc b/lib/swoc/src/TextView.cc index fbfb343106..5e6cd74911 100644 --- a/lib/swoc/src/TextView.cc +++ b/lib/swoc/src/TextView.cc @@ -63,7 +63,12 @@ svtoi(TextView src, TextView *out, int base) { out->assign(start, parsed.data_end()); } if (neg) { -zret = -intmax_t(std::min(n, ABS_MIN)); +uintmax_t temp = std::min(n, ABS_MIN); +if (temp == ABS_MIN) { + zret = std::numeric_limits::min(); +} else { + zret = -intmax_t(temp); +} } else { zret = std::min(n, ABS_MAX); }
(trafficserver-ingress-controller) branch master updated: Update build.yml (#183)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 42acae2 Update build.yml (#183) 42acae2 is described below commit 42acae28370aa9eaac12356b70f90bb391cd2b13 Author: Kit Chan AuthorDate: Mon Jan 8 00:33:09 2024 -0800 Update build.yml (#183) --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6fa4081..4245072 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,10 +28,10 @@ jobs: submodules: 'true' - name: Setup Minikube -uses: manusa/actions-setup-minikube@v2.10.0 +uses: manusa/actions-setup-minikube@v2.7.2 with: - minikube version: 'v1.32.0' - kubernetes version: 'v1.24.17' + minikube version: 'v1.28.0' + kubernetes version: 'v1.25.16' github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7
(trafficserver-ingress-controller) branch master updated: Update build.yml (#182)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new af4a547 Update build.yml (#182) af4a547 is described below commit af4a54785c4cc57945cc340b70c6b960ab0b45ed Author: Kit Chan AuthorDate: Sun Jan 7 23:45:32 2024 -0800 Update build.yml (#182) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c1a216..6fa4081 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: uses: manusa/actions-setup-minikube@v2.10.0 with: minikube version: 'v1.32.0' - kubernetes version: 'v1.26.11' + kubernetes version: 'v1.24.17' github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7
(trafficserver-ingress-controller) branch master updated: Update build.yml (#181)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 3f72561 Update build.yml (#181) 3f72561 is described below commit 3f725617358bee538e34f0d753f0bdc9a70799d3 Author: Kit Chan AuthorDate: Sun Jan 7 21:06:12 2024 -0800 Update build.yml (#181) --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e38748e..2c1a216 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,13 +31,13 @@ jobs: uses: manusa/actions-setup-minikube@v2.10.0 with: minikube version: 'v1.32.0' - kubernetes version: 'v1.27.8' + kubernetes version: 'v1.26.11' github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7 uses: actions/setup-python@v2 with: - python-version: '3.7.16' + python-version: '3.7' - name: Build ATS Alpine run: docker build -t ats-ingress .
(trafficserver-ingress-controller) branch master updated: Update build.yml (#180)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new dc4040c Update build.yml (#180) dc4040c is described below commit dc4040cf91451ed5caa864ad74bf7675be99a501 Author: Kit Chan AuthorDate: Sun Jan 7 20:04:45 2024 -0800 Update build.yml (#180) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8bfb176..e38748e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: - name: Set up Python 3.7 uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: '3.7.16' - name: Build ATS Alpine run: docker build -t ats-ingress .
(trafficserver-ingress-controller) branch master updated: Update build.yml (#179)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 3a65544 Update build.yml (#179) 3a65544 is described below commit 3a6554459ee35b0e4349198567eedc2bbaf14e9f Author: Kit Chan AuthorDate: Sun Jan 7 19:07:36 2024 -0800 Update build.yml (#179) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f544a3..8bfb176 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: uses: manusa/actions-setup-minikube@v2.10.0 with: minikube version: 'v1.32.0' - kubernetes version: 'v1.28.3' + kubernetes version: 'v1.27.8' github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7
(trafficserver-ingress-controller) branch master updated: Update build.yml (#178)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 00ff8b4 Update build.yml (#178) 00ff8b4 is described below commit 00ff8b400c3b31db6101d4e63bfb93f4769a4549 Author: Kit Chan AuthorDate: Sun Jan 7 17:58:56 2024 -0800 Update build.yml (#178) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7cd5f6..5f544a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: uses: manusa/actions-setup-minikube@v2.10.0 with: minikube version: 'v1.32.0' - kubernetes version: 'v1.28.4' + kubernetes version: 'v1.28.3' github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7
(trafficserver-ingress-controller) branch master updated: Update k8s / minikube versions (#177)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new c02072f Update k8s / minikube versions (#177) c02072f is described below commit c02072f83c3d589d3ec64a10e24aaa08208fa364 Author: Kit Chan AuthorDate: Sun Jan 7 15:49:06 2024 -0800 Update k8s / minikube versions (#177) --- .github/workflows/build.yml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2aa3261..e7cd5f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,16 +28,16 @@ jobs: submodules: 'true' - name: Setup Minikube -uses: manusa/actions-setup-minikube@v2.7.2 +uses: manusa/actions-setup-minikube@v2.10.0 with: - minikube version: 'v1.26.1' - kubernetes version: 'v1.24.12' + minikube version: 'v1.32.0' + kubernetes version: 'v1.28.4' github token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python 3.7 uses: actions/setup-python@v2 with: - python-version: '3.7.16' + python-version: '3.7' - name: Build ATS Alpine run: docker build -t ats-ingress .
(trafficserver-ingress-controller) branch master updated: Comment out the broken exporter (#176)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 465beaa Comment out the broken exporter (#176) 465beaa is described below commit 465beaaad4228682bc9e97f976377c2a8bebfdc9 Author: Kit Chan AuthorDate: Fri Jan 5 21:04:51 2024 -0800 Comment out the broken exporter (#176) --- tests/data/setup/traffic-server/ats-deployment.yaml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/data/setup/traffic-server/ats-deployment.yaml b/tests/data/setup/traffic-server/ats-deployment.yaml index e9824ab..e11a7b2 100644 --- a/tests/data/setup/traffic-server/ats-deployment.yaml +++ b/tests/data/setup/traffic-server/ats-deployment.yaml @@ -81,12 +81,12 @@ spec: mountPath: "/var/log" - name: config-volume mountPath: "/fluentd/etc" -- name: trafficserver-exporter - image: ats-ingress-exporter:latest - imagePullPolicy: IfNotPresent - args: ["--endpoint=http://127.0.0.1:8080/_stats;] - ports: - - containerPort: 9122 +#- name: trafficserver-exporter +# image: ats-ingress-exporter:latest +# imagePullPolicy: IfNotPresent +# args: ["--endpoint=http://127.0.0.1:8080/_stats;] +# ports: +# - containerPort: 9122 volumes: - name: ats-ssl secret:
(trafficserver-ingress-controller) branch master updated: Update build.yml (#175)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new b2ba425 Update build.yml (#175) b2ba425 is described below commit b2ba425c144d11c8b69db84bdbcc2bf087471b02 Author: Kit Chan AuthorDate: Fri Jan 5 08:48:13 2024 -0800 Update build.yml (#175) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58d43c7..2aa3261 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: - name: Set up Python 3.7 uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: '3.7.16' - name: Build ATS Alpine run: docker build -t ats-ingress .
(trafficserver-ingress-controller) branch master updated: Upgrade to alpine linux 3.16.8 (#174)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new c216bcd Upgrade to alpine linux 3.16.8 (#174) c216bcd is described below commit c216bcd96cc27fd01f95e1ff5f5f0ed2493e8676 Author: Kit Chan AuthorDate: Tue Dec 26 22:44:19 2023 +0100 Upgrade to alpine linux 3.16.8 (#174) * Update Dockerfile * Update README.md --- Dockerfile | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b9134ab..f225fc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -FROM alpine:3.16.7 as builder +FROM alpine:3.16.8 as builder RUN apk add --no-cache --virtual .tools \ bzip2 curl nghttp2-libs=1.47.0-r2 git automake libtool autoconf make sed file perl openrc openssl=1.1.1w-r1 @@ -123,7 +123,7 @@ RUN mkdir -p /opt/ats/var/run/redis/ \ # set up ingress log location RUN mkdir -p /opt/ats/var/log/ingress/ -FROM alpine:3.16.7 +FROM alpine:3.16.8 # essential library RUN apk add --no-cache -U \ diff --git a/README.md b/README.md index 43760d7..c851066 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md) ## Versions of Software Used -- Alpine Linux 3.16.7 +- Alpine Linux 3.16.8 - Apache Traffic Server 9.2.3 - LuaJIT 2.0.4 - Go (Version can be found in `GO_VERSION` file found at the base of this repository)
(trafficserver) branch master updated (11c3f8d82c -> f1f36af2c7)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 11c3f8d82c Adjust ReturnCode for MakeATSProcess on ubuntu22 (#10904) add f1f36af2c7 Fuzz http3 and http2 responses (#10926) No new revisions were added by this update. Summary of changes: tests/fuzzing/fuzz_http.cc | 30 +- 1 file changed, 25 insertions(+), 5 deletions(-)
(trafficserver-ingress-controller) branch master updated: Update Dockerfile (#173)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 114a0e9 Update Dockerfile (#173) 114a0e9 is described below commit 114a0e9aee692cddb494d36b667e55c57604c38c Author: Kit Chan AuthorDate: Thu Dec 7 15:15:56 2023 +0100 Update Dockerfile (#173) --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a1dc7ba..b9134ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ FROM alpine:3.16.7 as builder RUN apk add --no-cache --virtual .tools \ - bzip2 curl=8.4.0-r0 nghttp2-libs=1.47.0-r2 git automake libtool autoconf make sed file perl openrc openssl=1.1.1w-r1 + bzip2 curl nghttp2-libs=1.47.0-r2 git automake libtool autoconf make sed file perl openrc openssl=1.1.1w-r1 # ATS dependencies RUN apk add --no-cache --virtual .ats-build-deps \ @@ -129,7 +129,7 @@ FROM alpine:3.16.7 RUN apk add --no-cache -U \ bash \ build-base \ -curl=8.4.0-r0 \ +curl \ nghttp2-libs=1.47.0-r2 \ ca-certificates \ pcre \
(trafficserver-ingress-controller) branch master updated: Upgrades to ATS/alpine (#172)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new a66e226 Upgrades to ATS/alpine (#172) a66e226 is described below commit a66e2264dc68fb61c8b969cf4eceea6f7985de51 Author: Kit Chan AuthorDate: Thu Dec 7 15:01:36 2023 +0100 Upgrades to ATS/alpine (#172) * Upgrades to ATS/alpine * Update README.md --- Dockerfile | 18 ++ README.md | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 77e4831..a1dc7ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,14 +15,14 @@ # limitations under the License. # -FROM alpine:3.16.5 as builder +FROM alpine:3.16.7 as builder RUN apk add --no-cache --virtual .tools \ - bzip2 curl git automake libtool autoconf make sed file perl openrc openssl + bzip2 curl=8.4.0-r0 nghttp2-libs=1.47.0-r2 git automake libtool autoconf make sed file perl openrc openssl=1.1.1w-r1 # ATS dependencies RUN apk add --no-cache --virtual .ats-build-deps \ - build-base openssl-dev tcl-dev pcre-dev zlib-dev \ + build-base openssl-dev=1.1.1w-r1 tcl-dev pcre-dev zlib-dev \ libexecinfo-dev linux-headers libunwind-dev \ brotli-dev jansson-dev luajit-dev readline-dev geoip-dev libxml2-dev @@ -34,8 +34,8 @@ RUN adduser -S -D -H -u 1000 -h /tmp -s /sbin/nologin -G ats -g ats ats # download and build ATS # patch 2 files due to pthread in musl vs glibc - see https://github.com/apache/trafficserver/pull/7611/files -RUN curl -L https://downloads.apache.org/trafficserver/trafficserver-9.2.0.tar.bz2 | bzip2 -dc | tar xf - \ - && cd trafficserver-9.2.0/ \ +RUN curl -L https://downloads.apache.org/trafficserver/trafficserver-9.2.3.tar.bz2 | bzip2 -dc | tar xf - \ + && cd trafficserver-9.2.3/ \ && sed -i "s/PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP/PTHREAD_RWLOCK_INITIALIZER/" include/tscore/ink_rwlock.h \ && sed -i "s/PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP/PTHREAD_RWLOCK_INITIALIZER/" include/tscpp/util/TsSharedMutex.h \ && autoreconf -if \ @@ -123,16 +123,18 @@ RUN mkdir -p /opt/ats/var/run/redis/ \ # set up ingress log location RUN mkdir -p /opt/ats/var/log/ingress/ -FROM alpine:3.16.5 +FROM alpine:3.16.7 # essential library RUN apk add --no-cache -U \ bash \ build-base \ -curl ca-certificates \ +curl=8.4.0-r0 \ +nghttp2-libs=1.47.0-r2 \ +ca-certificates \ pcre \ zlib \ -openssl \ +openssl=1.1.1w-r1 \ brotli \ jansson \ luajit \ diff --git a/README.md b/README.md index 3ce2250..43760d7 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md) ## Versions of Software Used -- Alpine Linux 3.16.5 -- Apache Traffic Server 9.2.0 +- Alpine Linux 3.16.7 +- Apache Traffic Server 9.2.3 - LuaJIT 2.0.4 - Go (Version can be found in `GO_VERSION` file found at the base of this repository) - Other Packages
(trafficserver) branch master updated (03ad26e4e5 -> 1267a00b06)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 03ad26e4e5 ConnectionTracker: Remove queue implementation (#10825) add 1267a00b06 Add support to disable jit in using lua plugin in remap (#10818) No new revisions were added by this update. Summary of changes: doc/admin-guide/plugins/lua.en.rst | 10 -- plugins/lua/ts_lua.cc | 15 +++ 2 files changed, 23 insertions(+), 2 deletions(-)
[trafficserver-ingress-controller] branch master updated: Bump urllib3 from 1.26.17 to 1.26.18 in /tests (#171)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new d1d396f Bump urllib3 from 1.26.17 to 1.26.18 in /tests (#171) d1d396f is described below commit d1d396fd47f6bc2f45571ae786ee9a68dcac443e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Oct 17 20:19:48 2023 -0700 Bump urllib3 from 1.26.17 to 1.26.18 in /tests (#171) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.17 to 1.26.18. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.17...1.26.18) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index d103310..8270d34 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,3 @@ pytest==5.4.3 requests==2.31.0 -urllib3==1.26.17 +urllib3==1.26.18
[trafficserver-ingress-controller] branch master updated: Bump golang.org/x/net from 0.8.0 to 0.17.0 (#170)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 338c4f1 Bump golang.org/x/net from 0.8.0 to 0.17.0 (#170) 338c4f1 is described below commit 338c4f150a90cd7337a335224fbdcd676f90bb3c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Oct 11 20:38:44 2023 -0300 Bump golang.org/x/net from 0.8.0 to 0.17.0 (#170) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.8.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.8.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 go.sum | 16 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 5cdbd8a..ab6d3c3 100644 --- a/go.mod +++ b/go.mod @@ -35,11 +35,11 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb // indirect - golang.org/x/net v0.8.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.6.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/term v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.0 // indirect diff --git a/go.sum b/go.sum index ff70eaa..8879ad6 100644 --- a/go.sum +++ b/go.sum @@ -159,8 +159,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= @@ -181,18 +181,18 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo
[trafficserver] branch 9.2.x updated: Add support for vconn start handler in lua plugin (#10573)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch 9.2.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/9.2.x by this push: new 44267901b3 Add support for vconn start handler in lua plugin (#10573) 44267901b3 is described below commit 44267901b3f4820f0ebc7a7f63955bbfd34dd20b Author: Kit Chan AuthorDate: Mon Oct 9 15:43:29 2023 -0300 Add support for vconn start handler in lua plugin (#10573) * Add support for vconn start handler in lua plugin * fix clang format issue * fix doc error --- doc/admin-guide/plugins/lua.en.rst | 94 ++ plugins/lua/Makefile.inc| 1 + plugins/lua/example/test_vconn.lua | 42 plugins/lua/ts_lua.c| 89 plugins/lua/ts_lua_common.h | 17 + plugins/lua/ts_lua_fetch.c | 4 ++ plugins/lua/ts_lua_hook.c | 10 +++ plugins/lua/ts_lua_http.c | 131 plugins/lua/ts_lua_http_intercept.c | 2 + plugins/lua/ts_lua_misc.c | 6 ++ plugins/lua/ts_lua_util.c | 92 + plugins/lua/ts_lua_util.h | 25 +-- plugins/lua/ts_lua_vconn.c | 105 + plugins/lua/ts_lua_vconn.h | 23 +++ 14 files changed, 636 insertions(+), 5 deletions(-) diff --git a/doc/admin-guide/plugins/lua.en.rst b/doc/admin-guide/plugins/lua.en.rst index 68e95843fb..06db5cb023 100644 --- a/doc/admin-guide/plugins/lua.en.rst +++ b/doc/admin-guide/plugins/lua.en.rst @@ -112,6 +112,7 @@ script, and we can write this in remap.config: This module can also act as a global plugin of Traffic Server. In this case we should provide one of these functions in each lua script: +- **'do_global_vconn_start'** - **'do_global_txn_start'** - **'do_global_txn_close'** - **'do_global_os_dns'** @@ -620,6 +621,7 @@ Hook point constants :: +TS_LUA_HOOK_VCONN_START TS_LUA_HOOK_OS_DNS TS_LUA_HOOK_PRE_REMAP TS_LUA_HOOK_READ_CACHE_HDR @@ -643,6 +645,8 @@ Additional Information: | | | do_remap() via | do_os_response() | global context via | | | | ts.hook()? | via ts.hook()? | ts.hook()? | +===+===+==++==+ +| TS_VCONN_START_HOOK | TS_LUA_HOOK_VCONN_START | NO | NO |YES | ++---+---+--++--+ | TS_HTTP_TXN | TS_LUA_HOOK | NO | NO |YES | | _START_HOOK | _TXN_START| | | | +---+---+--++--+ @@ -3376,6 +3380,66 @@ Here is an example :ref:`TOP ` +ts.http.get_ssn_remote_addr +--- +**syntax:** *ts.http.get_ssn_remote_addr()* + +**context:** after do_global_read_reqest + +**description:** This function can be used to get the remote address (IP, port, family) of the session. + +`TOP <#ts-lua-plugin>`_ + +ts.http.get_client_received_error +- +**syntax:** *ts.http.get_client_received_error()* + +**context:** after do_global_txn_close + +**description:** This function can be used to get the client received error from transaction. + +Here is an example + +:: + +function do_global_txn_close() +local class, code = ts.http.get_client_received_error() +ts.debug('txn_close: '..class) +ts.debug('txn_close: '..code) +end + +`TOP <#ts-lua-plugin>`_ + +ts.http.get_client_sent_error +- +**syntax:** *ts.http.get_client_sent_error()* + +**context:** after do_global_txn_close + +**description:** This function can be used to get the client sent error from transaction. + +`TOP <#ts-lua-plugin>`_ + +ts.http.get_server_received_error +- +**syntax:** *ts.http.get_server_received_error()* + +**context:** after do_global_txn_close + +**description:** This function can be used to get the server received error from transaction. + +`TOP <#ts-lua-plugin>`_ + +ts.http.get_server_sent_error +- +**syntax:** *ts.http.get_server_sent_error()* + +**context:** after do_global_txn_close + +**description:** This function can be used to get the server sent error from transaction. + +`TOP <#ts-lua-plugin>`_ + ts.add_package_path --- **syntax:**
[trafficserver] branch 8.1.x updated: Add support for vconn start handler for lua plugin (#10575)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 32cbd5baad Add support for vconn start handler for lua plugin (#10575) 32cbd5baad is described below commit 32cbd5baadc946fc87c78b1b3a8b778a081ff3c7 Author: Kit Chan AuthorDate: Mon Oct 9 15:43:42 2023 -0300 Add support for vconn start handler for lua plugin (#10575) * add support for vconn start for lua plugin * fix clang format --- doc/admin-guide/plugins/lua.en.rst | 84 +++ plugins/lua/Makefile.inc| 1 + plugins/lua/example/test_vconn.lua | 40 +++ plugins/lua/ts_lua.c| 87 plugins/lua/ts_lua_common.h | 17 + plugins/lua/ts_lua_fetch.c | 4 ++ plugins/lua/ts_lua_hook.c | 10 +++ plugins/lua/ts_lua_http.c | 131 plugins/lua/ts_lua_http_intercept.c | 2 + plugins/lua/ts_lua_misc.c | 6 ++ plugins/lua/ts_lua_util.c | 92 + plugins/lua/ts_lua_util.h | 25 +-- plugins/lua/ts_lua_vconn.c | 87 plugins/lua/ts_lua_vconn.h | 21 ++ 14 files changed, 602 insertions(+), 5 deletions(-) diff --git a/doc/admin-guide/plugins/lua.en.rst b/doc/admin-guide/plugins/lua.en.rst index 8cf69b17ba..3e27e1ba44 100644 --- a/doc/admin-guide/plugins/lua.en.rst +++ b/doc/admin-guide/plugins/lua.en.rst @@ -96,6 +96,7 @@ script, and we can write this in remap.config: This module can also act as a global plugin of Traffic Server. In this case we should provide one of these functions in each lua script: +- **'do_global_vconn_start'** - **'do_global_txn_start'** - **'do_global_txn_close'** - **'do_global_os_dns'** @@ -478,6 +479,7 @@ Hook point constants :: +TS_LUA_HOOK_VCONN_START TS_LUA_HOOK_OS_DNS TS_LUA_HOOK_PRE_REMAP TS_LUA_HOOK_READ_CACHE_HDR @@ -501,6 +503,8 @@ Additional Information: | | | do_remap() via | do_os_response() | global context via | | | | ts.hook()? | via ts.hook()? | ts.hook()? | +===+===+==++==+ +| TS_VCONN_START_HOOK | TS_LUA_HOOK_VCONN_START | NO | NO |YES | ++---+---+--++--+ | TS_HTTP_TXN | TS_LUA_HOOK | NO | NO |YES | | _START_HOOK | _TXN_START| | | | +---+---+--++--+ @@ -2745,6 +2749,66 @@ Here is an example `TOP <#ts-lua-plugin>`_ +ts.http.get_ssn_remote_addr +--- +**syntax:** *ts.http.get_ssn_remote_addr()* + +**context:** after do_global_read_reqest + +**description:** This function can be used to get the remote address (IP, port, family) of the session. + +`TOP <#ts-lua-plugin>`_ + +ts.http.get_client_received_error +- +**syntax:** *ts.http.get_client_received_error()* + +**context:** after do_global_txn_close + +**description:** This function can be used to get the client received error from transaction. + +Here is an example + +:: + +function do_global_txn_close() +local class, code = ts.http.get_client_received_error() +ts.debug('txn_close: '..class) +ts.debug('txn_close: '..code) +end + +`TOP <#ts-lua-plugin>`_ + +ts.http.get_client_sent_error +- +**syntax:** *ts.http.get_client_sent_error()* + +**context:** after do_global_txn_close + +**description:** This function can be used to get the client sent error from transaction. + +`TOP <#ts-lua-plugin>`_ + +ts.http.get_server_received_error +- +**syntax:** *ts.http.get_server_received_error()* + +**context:** after do_global_txn_close + +**description:** This function can be used to get the server received error from transaction. + +`TOP <#ts-lua-plugin>`_ + +ts.http.get_server_sent_error +- +**syntax:** *ts.http.get_server_sent_error()* + +**context:** after do_global_txn_close + +**description:** This function can be used to get the server sent error from transaction. + +`TOP <#ts-lua-plugin>`_ + ts.add_package_path --- **syntax:** *ts.add_package_path(lua-
[trafficserver] branch master updated (0dfb832ff6 -> ff21aaf6de)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 0dfb832ff6 APIs to get the h2 error codes and a plugin to use them (#10570) add ff21aaf6de Add support for vconn start handler for lua plugin (#10574) No new revisions were added by this update. Summary of changes: doc/admin-guide/plugins/lua.en.rst | 94 +++ plugins/lua/Makefile.inc | 1 + .../{test_client_socket.lua => test_vconn.lua} | 36 +++--- plugins/lua/ts_lua.cc | 89 ++ plugins/lua/ts_lua_common.h| 17 +++ plugins/lua/ts_lua_fetch.cc| 4 + plugins/lua/ts_lua_hook.cc | 10 ++ plugins/lua/ts_lua_http.cc | 131 + plugins/lua/ts_lua_http_intercept.cc | 2 + plugins/lua/ts_lua_misc.cc | 6 + plugins/lua/ts_lua_util.cc | 92 +++ plugins/lua/ts_lua_util.h | 25 +++- plugins/lua/ts_lua_vconn.cc| 103 plugins/lua/{ts_lua_log.h => ts_lua_vconn.h} | 4 +- 14 files changed, 589 insertions(+), 25 deletions(-) copy plugins/lua/example/{test_client_socket.lua => test_vconn.lua} (51%) create mode 100644 plugins/lua/ts_lua_vconn.cc copy plugins/lua/{ts_lua_log.h => ts_lua_vconn.h} (94%)
[trafficserver] branch master updated: [Fuzzing] add cifuzz (#10462)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new cac766d434 [Fuzzing] add cifuzz (#10462) cac766d434 is described below commit cac766d434ba8ee3dd310453f42f2e34cd16ec45 Author: Arjun <36335769+0x...@users.noreply.github.com> AuthorDate: Wed Oct 4 23:57:25 2023 +0530 [Fuzzing] add cifuzz (#10462) * [Fuzzing] add cifuzz Signed-off-by: Arjun Singh * [Fuzzing] fix i'm stupid Signed-off-by: Arjun Singh * [cifuzz] update pr Signed-off-by: Arjun Singh - Signed-off-by: Arjun Singh --- .github/workflows/cifuzz.yml | 38 ++ tests/fuzzing/oss-fuzz.sh| 4 ++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml new file mode 100644 index 00..9e906cbd1b --- /dev/null +++ b/.github/workflows/cifuzz.yml @@ -0,0 +1,38 @@ +name: CIFuzz +on: + schedule: +- cron: '0 0 * * 0' +permissions: {} +jobs: + Fuzzing: +runs-on: ubuntu-latest +permissions: + security-events: write +steps: +- name: Build Fuzzers + id: build + uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master + with: +oss-fuzz-project-name: 'trafficserver' +language: c++ +- name: Run Fuzzers + uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master + with: +oss-fuzz-project-name: 'trafficserver' +language: c++ +fuzz-seconds: 300 +output-sarif: true +- name: Upload Crash + uses: actions/upload-artifact@v3 + if: failure() && steps.build.outcome == 'success' + with: +name: artifacts +path: ./out/artifacts +- name: Upload Sarif + if: always() && steps.build.outcome == 'success' + uses: github/codeql-action/upload-sarif@v2 + with: + # Path to SARIF file relative to the root of the repository +sarif_file: cifuzz-sarif/results.sarif +checkout_path: cifuzz-sarif +category: CIFuzz diff --git a/tests/fuzzing/oss-fuzz.sh b/tests/fuzzing/oss-fuzz.sh index ac4640cde1..2fcac3704c 100644 --- a/tests/fuzzing/oss-fuzz.sh +++ b/tests/fuzzing/oss-fuzz.sh @@ -39,6 +39,6 @@ cp $SRC/trafficserver/tests/fuzzing/*.zip $OUT/ if [[ $SANITIZER = undefined ]] then -rm $OUT/fuzz_http -rm $OUT/fuzz_hpack +rm -f $OUT/fuzz_http +rm -f $OUT/fuzz_hpack fi
[trafficserver-ingress-controller] branch master updated: Bump urllib3 from 1.26.5 to 1.26.17 in /tests (#169)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 988c1cd Bump urllib3 from 1.26.5 to 1.26.17 in /tests (#169) 988c1cd is described below commit 988c1cd6508bb0a9b3bf257d00d5e93245a5654d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Oct 2 22:26:32 2023 -0700 Bump urllib3 from 1.26.5 to 1.26.17 in /tests (#169) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.5 to 1.26.17. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.5...1.26.17) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 812592e..d103310 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,3 @@ pytest==5.4.3 requests==2.31.0 -urllib3==1.26.5 +urllib3==1.26.17
[trafficserver] branch master updated (e05f6d4a05 -> c99bf26ad0)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from e05f6d4a05 macOS compiler error with clang (#10527) add c99bf26ad0 Add support for Wasmtime (#10515) No new revisions were added by this update. Summary of changes: configure.ac | 18 +- doc/admin-guide/plugins/wasm.en.rst| 27 +++-- plugins/experimental/wasm/Makefile.inc | 15 + plugins/experimental/wasm/wasm_main.cc | 105 +++-- 4 files changed, 116 insertions(+), 49 deletions(-)
[trafficserver] branch master updated: [Fuzzing] move build.sh in trafficserver (#10466)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 26db54022d [Fuzzing] move build.sh in trafficserver (#10466) 26db54022d is described below commit 26db54022de18da8d687948b0a03a4f251520b90 Author: Arjun <36335769+0x...@users.noreply.github.com> AuthorDate: Tue Sep 19 13:48:38 2023 +0530 [Fuzzing] move build.sh in trafficserver (#10466) * [Fuzzing] move build.sh in trafficserver Signed-off-by: Arjun Singh * [Fuzzing] change script name Signed-off-by: Arjun Singh - Signed-off-by: Arjun Singh --- tests/fuzzing/oss-fuzz.sh | 44 1 file changed, 44 insertions(+) diff --git a/tests/fuzzing/oss-fuzz.sh b/tests/fuzzing/oss-fuzz.sh new file mode 100644 index 00..ac4640cde1 --- /dev/null +++ b/tests/fuzzing/oss-fuzz.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# don't use __cxa_atexit for coverage sanitizer +if [[ $SANITIZER = coverage ]] +then +export CXXFLAGS="$CXXFLAGS -fno-use-cxa-atexit" +fi + +# don't use unsigned-integer-overflow sanitizer {Bug in system include files} +if [[ $SANITIZER = undefined ]] +then +export CXXFLAGS="$CXXFLAGS -fno-sanitize=unsigned-integer-overflow" +fi + +mkdir -p build && cd build/ +cmake -DENABLE_POSIX_CAP=OFF -DENABLE_FUZZING=ON -DYAML_BUILD_SHARED_LIBS=OFF -DENABLE_HWLOC=OFF -DENABLE_JEMALLOC=OFF -DENABLE_LUAJIT=OFF ../. +make -j$(nproc) --ignore-errors + +cp tests/fuzzing/fuzz_* $OUT/ +cp -r tests/fuzzing/lib/ $OUT/ +cp $SRC/trafficserver/tests/fuzzing/*.zip $OUT/ + +if [[ $SANITIZER = undefined ]] +then +rm $OUT/fuzz_http +rm $OUT/fuzz_hpack +fi
[trafficserver] branch master updated: [Fuzzing] linker (#10449)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new ecd22b94e8 [Fuzzing] linker (#10449) ecd22b94e8 is described below commit ecd22b94e8feed2d1edc8292b789937a9f4521cc Author: Arjun <36335769+0x...@users.noreply.github.com> AuthorDate: Mon Sep 18 22:18:24 2023 +0530 [Fuzzing] linker (#10449) Signed-off-by: Arjun Singh --- tests/fuzzing/CMakeLists.txt | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/fuzzing/CMakeLists.txt b/tests/fuzzing/CMakeLists.txt index 9e688a4a2f..4ee7873dde 100644 --- a/tests/fuzzing/CMakeLists.txt +++ b/tests/fuzzing/CMakeLists.txt @@ -31,14 +31,24 @@ add_executable(fuzz_yamlcpp fuzz_yamlcpp.cc) target_link_libraries(fuzz_esi PRIVATE esi-common esicore) -target_link_libraries(fuzz_hpack PRIVATE ts::http2 ts::hdrs ts::tsapi) -target_link_libraries(fuzz_http PRIVATE ts::hdrs ts::tsapi) +target_link_libraries(fuzz_hpack PRIVATE records tscore hdrs inkevent) +target_link_libraries(fuzz_http PRIVATE ts::hdrs ts::tscore ts::inkevent) target_link_libraries(fuzz_json PRIVATE libswoc yaml-cpp ts::jsonrpc_protocol) target_link_libraries(fuzz_proxy_protocol PRIVATE inknet inkevent ts::tscore yaml-cpp libswoc) -target_link_libraries(fuzz_rec_http PRIVATE ts::records ts::tsapi) +target_link_libraries(fuzz_rec_http PRIVATE records tscore libswoc) target_link_libraries(fuzz_yamlcpp PRIVATE yaml-cpp) +target_sources(fuzz_hpack PRIVATE +${CMAKE_SOURCE_DIR}/proxy/http2/HTTP2.cc +${CMAKE_SOURCE_DIR}/proxy/http2/Http2Frame.cc +${CMAKE_SOURCE_DIR}/proxy/http2/HPACK.cc +) +target_include_directories(fuzz_hpack PRIVATE +${CMAKE_SOURCE_DIR}/proxy/http2 +${PROXY_INCLUDE_DIRS} +${CMAKE_SOURCE_DIR}/iocore/utils +) target_include_directories(fuzz_json PRIVATE ${CMAKE_SOURCE_DIR}/mgmt ${CMAKE_SOURCE_DIR}/mgmt/rpc
[trafficserver] branch master updated: [Fuzzing] add fuzzing test (#10151)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 3a7f0192f2 [Fuzzing] add fuzzing test (#10151) 3a7f0192f2 is described below commit 3a7f0192f2ec8aa61cb19d882d68631b02c70c4b Author: Arjun <36335769+0x...@users.noreply.github.com> AuthorDate: Mon Sep 18 02:57:59 2023 +0530 [Fuzzing] add fuzzing test (#10151) * [Fuzzing] add fuzzing test Signed-off-by: Arjun Singh * [Fuzzing] try fix Signed-off-by: Arjun Singh * [Fuzzing] try fix Signed-off-by: Arjun Singh - Signed-off-by: Arjun Singh --- CMakeLists.txt| 11 +++ README.md | 20 ++ lib/fastlz/CMakeLists.txt | 2 +- lib/yamlcpp/CMakeLists.txt| 4 ++ tests/fuzzing/CMakeLists.txt | 63 + tests/fuzzing/fuzz_esi.cc | 64 + tests/fuzzing/fuzz_esi_seed_corpus.zip| Bin 0 -> 2337 bytes tests/fuzzing/fuzz_hpack.cc | 60 tests/fuzzing/fuzz_hpack_seed_corpus.zip | Bin 0 -> 410 bytes tests/fuzzing/fuzz_http.cc| 80 ++ tests/fuzzing/fuzz_http_seed_corpus.zip | Bin 0 -> 1902 bytes tests/fuzzing/fuzz_json.cc| 78 + tests/fuzzing/fuzz_json_seed_corpus.zip | Bin 0 -> 867 bytes tests/fuzzing/fuzz_proxy_protocol.cc | 44 tests/fuzzing/fuzz_proxy_protocol_seed_corpus.zip | Bin 0 -> 3659 bytes tests/fuzzing/fuzz_rec_http.cc| 48 + tests/fuzzing/fuzz_rec_http_seed_corpus.zip | Bin 0 -> 1015 bytes tests/fuzzing/fuzz_yamlcpp.cc | 41 +++ tests/fuzzing/fuzz_yamlcpp_seed_corpus.zip| Bin 0 -> 1636 bytes 19 files changed, 514 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 922ace33b9..4fa39d39e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ auto_option(LUAJIT PACKAGE_DEPENDS LuaJIT) auto_option(UNWIND FEATURE_VAR TS_USE_REMOTE_UNWINDING PACKAGE_DEPENDS unwind) option(ENABLE_ASAN "Use address sanitizer (default OFF)") +option(ENABLE_FUZZING "Enable fuzzing (default OFF)") option(BUILD_REGRESSION_TESTING "Build regression tests (default ON)" ON) option(BUILD_EXPERIMENTAL_PLUGINS "Build the experimental plugins (default OFF)") set(DEFAULT_STACK_SIZE 1048576 CACHE STRING "Default stack size (default 1048576)") @@ -375,6 +376,13 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) add_compile_definitions(${HOST_OS} PACKAGE_NAME="ats" PACKAGE_VERSION="${TS_VERSION_STRING}") add_compile_options($<$:-Wno-invalid-offsetof>) +# Enable fuzzing +if(ENABLE_FUZZING) +if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") +message(FATAL_ERROR "Fuzzing is only supported with clang") +endif() +endif() + # Common includes for everyone include_directories( ${CMAKE_SOURCE_DIR}/include @@ -448,6 +456,9 @@ add_subdirectory(src/tests) if(ENABLE_AUTEST) add_subdirectory(tests) endif() +if(ENABLE_FUZZING) +add_subdirectory(tests/fuzzing) +endif() add_subdirectory(plugins) add_subdirectory(configs) if(ENABLE_EXAMPLE) diff --git a/README.md b/README.md index 8126906c99..57068a2a57 100644 --- a/README.md +++ b/README.md @@ -276,6 +276,26 @@ software: > The functionality of OpenSSL <http://www.openssl.org/> is > utilized in parts of the software. +## Fuzzing + +### FLAGS + +```bash +export CC=clang +export CXX=clang++ +export CFLAGS="-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=address -fsanitize-address-use-after-scope -fsanitize=fuzzer-no-link" +export CXXFLAGS="-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=address -fsanitize-address-use-after-scope -fsanitize=fuzzer-no-link" +export LIB_FUZZING_ENGINE=-fsanitize=fuzzer +``` + +### Compile + +```bash +mkdir -p build && cd build/ +cmake -DENABLE_POSIX_CAP=OFF -DENABLE_FUZZING=ON -DYAML_BUILD_SHARED_LIBS=OFF ../. +make -j$(nproc) +``` + ## ADDITIONAL INFO - Web page: https://trafficserver.apache.org/ diff --git a/lib/fastlz/CMakeLists.txt b/lib/fastlz/CMakeLists.txt index 1a283f50e4..b08b6ba1a3 100644 --- a/lib/fastlz/CMakeLists.txt +++ b/lib/fastlz/CMakeLists.txt @@ -16,6 +16,6 @@ ### -add_library(fastlz) +add_library(fastlz STATIC) target_sources(fastlz PRIVATE fastlz.cc fastlz.h)
[trafficserver] branch master updated (71a81c214c -> 8659235196)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 71a81c214c Fix CID 1508970: Uninitialized scalar variable (#10282) add 8659235196 Fix CID 1508979: unchecked return value (#10281) No new revisions were added by this update. Summary of changes: plugins/lua/ts_lua_util.cc | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
[trafficserver] branch master updated (5545f4e139 -> 71a81c214c)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 5545f4e139 Fix CID 1508992, 1508976, 1508972: uninitialized scalar variables (#10275) add 71a81c214c Fix CID 1508970: Uninitialized scalar variable (#10282) No new revisions were added by this update. Summary of changes: plugins/lua/ts_lua.cc | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
[trafficserver] branch master updated: Fix CID 1508992, 1508976, 1508972: uninitialized scalar variables (#10275)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 5545f4e139 Fix CID 1508992, 1508976, 1508972: uninitialized scalar variables (#10275) 5545f4e139 is described below commit 5545f4e139a9802afb6839e94e944565a70ec172 Author: Kit Chan AuthorDate: Fri Aug 25 13:13:04 2023 -0700 Fix CID 1508992, 1508976, 1508972: uninitialized scalar variables (#10275) --- plugins/lua/ts_lua_crypto.cc | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/lua/ts_lua_crypto.cc b/plugins/lua/ts_lua_crypto.cc index 5e66c0136e..34ee04c71f 100644 --- a/plugins/lua/ts_lua_crypto.cc +++ b/plugins/lua/ts_lua_crypto.cc @@ -299,8 +299,8 @@ ts_lua_hmac_md5(lua_State *L) unsigned char *key_bin; unsigned int key_bin_len; - u_char sha_buf[TS_LUA_MD5_DIGEST_LENGTH]; - u_char hex_buf[2 * sizeof(sha_buf)]; + u_char sha_buf[TS_LUA_MD5_DIGEST_LENGTH] = {0}; + u_char hex_buf[2 * sizeof(sha_buf)] = {0}; unsigned int output_length; if (lua_gettop(L) != 2) { @@ -354,8 +354,8 @@ ts_lua_hmac_sha1(lua_State *L) unsigned char *key_bin; unsigned int key_bin_len; - u_char sha_buf[TS_LUA_SHA1_DIGEST_LENGTH]; - u_char hex_buf[2 * sizeof(sha_buf)]; + u_char sha_buf[TS_LUA_SHA1_DIGEST_LENGTH] = {0}; + u_char hex_buf[2 * sizeof(sha_buf)] = {0}; unsigned int output_length; if (lua_gettop(L) != 2) { @@ -409,8 +409,8 @@ ts_lua_hmac_sha256(lua_State *L) unsigned char *key_bin; unsigned int key_bin_len; - u_char sha_buf[TS_LUA_SHA256_DIGEST_LENGTH]; - u_char hex_buf[2 * sizeof(sha_buf)]; + u_char sha_buf[TS_LUA_SHA256_DIGEST_LENGTH] = {0}; + u_char hex_buf[2 * sizeof(sha_buf)] = {0}; unsigned int output_length; if (lua_gettop(L) != 2) {
[trafficserver] branch master updated: Remove reference to WAVM (#10147)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new ab0a572882 Remove reference to WAVM (#10147) ab0a572882 is described below commit ab0a572882377165109fecc6f818154bdacb4bca Author: Kit Chan AuthorDate: Fri Aug 4 09:47:50 2023 -0700 Remove reference to WAVM (#10147) --- configure.ac | 3 - doc/admin-guide/plugins/wasm.en.rst| 15 +-- plugins/experimental/wasm/Makefile.inc | 2 + .../wasm/lib/include/proxy-wasm/context.h | 6 +- .../wasm/lib/include/proxy-wasm/wasm.h | 1 + plugins/experimental/wasm/lib/src/context.cc | 6 ++ plugins/experimental/wasm/lib/src/hash.cc | 54 ++ plugins/experimental/wasm/lib/src/hash.h | 27 + plugins/experimental/wasm/lib/src/wamr/wamr.cc | 28 +++-- plugins/experimental/wasm/lib/src/wasm.cc | 116 +++-- 10 files changed, 201 insertions(+), 57 deletions(-) diff --git a/configure.ac b/configure.ac index 73d8a2c587..91445116c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1441,9 +1441,6 @@ AC_SUBST(use_quic) AC_SUBST(has_quiche) AM_CONDITIONAL([ENABLE_QUIC], [test "x$enable_quic" = "xyes"]) -# Check for optional WAVM library -TS_CHECK_WAVM - # # Enable experimental/uri_signing plugin # This is here, instead of above, because it needs to know if PCRE is available. diff --git a/doc/admin-guide/plugins/wasm.en.rst b/doc/admin-guide/plugins/wasm.en.rst index cf92af6157..ad07543c5a 100644 --- a/doc/admin-guide/plugins/wasm.en.rst +++ b/doc/admin-guide/plugins/wasm.en.rst @@ -36,7 +36,7 @@ How it Works The plugin uses the library and header files from the Proxy-Wasm project. -* https://github.com/proxy-wasm/proxy-wasm-cpp-host/tree/72ce32f7b11f9190edf874028255e1309e41690f +* https://github.com/proxy-wasm/proxy-wasm-cpp-host/tree/b7e690703c7f26707438a2f1ebd7c197bc8f0296 * https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/tree/fd0be8405db25de0264bdb78fae3a82668c03782 Proxy-Wasm in turn uses an underlying WebAssembly runtime to execute the WebAssembly module. (Currently only WAMR and @@ -56,9 +56,9 @@ Compiling the Plugin :: - wget https://github.com/bytecodealliance/wasm-micro-runtime/archive/c3d66f916ef8093e5c8cacf3329ed968f807cf58.tar.gz - tar zxvf c3d66f916ef8093e5c8cacf3329ed968f807cf58.tar.gz - cd wasm-micro-runtime-c3d66f916ef8093e5c8cacf3329ed968f807cf58 + wget https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-1.2.1.tar.gz + tar zxvf WAMR-1.2.1.tar.gz + cd wasm-micro-runtime-WAMR-1.2.1 cp core/iwasm/include/* /usr/local/include/ cd product-mini/platforms/linux mkdir build @@ -71,13 +71,14 @@ Compiling the Plugin :: - wget https://github.com/WasmEdge/WasmEdge/archive/refs/tags/proxy-wasm/0.11.2.tar.gz - tar zxvf 0.11.2.tar.gz - cd WasmEdge-proxy-wasm-0.11.2/utils + wget https://github.com/WasmEdge/WasmEdge/archive/refs/tags/proxy-wasm/0.13.1.tar.gz + tar zxvf 0.13.1.tar.gz + cd WasmEdge-proxy-wasm-0.13.1/utils ./install.sh * Copy contents from ~/.wasmedge/include to /usr/local/include * Copy contents from ~/.wasmedge/lib to /usr/local/lib +* The installation script will make changes to your environment variables. You can comment those out for now before compiling the plugin. **Configure ATS to compile with experimental plugins** diff --git a/plugins/experimental/wasm/Makefile.inc b/plugins/experimental/wasm/Makefile.inc index ebd92050c5..340df03896 100755 --- a/plugins/experimental/wasm/Makefile.inc +++ b/plugins/experimental/wasm/Makefile.inc @@ -55,6 +55,8 @@ experimental_wasm_wasm_la_SOURCES = \ experimental/wasm/lib/include/proxy-wasm/shared_data.h \ experimental/wasm/lib/src/shared_queue.cc \ experimental/wasm/lib/include/proxy-wasm/shared_queue.h \ +experimental/wasm/lib/src/hash.cc \ +experimental/wasm/lib/src/hash.h \ experimental/wasm/lib/src/signature_util.cc \ experimental/wasm/lib/include/proxy-wasm/signature_util.h \ experimental/wasm/lib/src/vm_id_handle.cc \ diff --git a/plugins/experimental/wasm/lib/include/proxy-wasm/context.h b/plugins/experimental/wasm/lib/include/proxy-wasm/context.h index 652b86b6e0..ab99cad70a 100644 --- a/plugins/experimental/wasm/lib/include/proxy-wasm/context.h +++ b/plugins/experimental/wasm/lib/include/proxy-wasm/context.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include "include/proxy-wasm/context_interface.h" @@ -53,8 +54,7 @@ struct PluginBase { std::string_view key) : name_(std::string(name)), root_id_(std::string(root_id)), vm_id_(std::string(vm_id)), engine_(std::string(engine)), plugin_configuration_(plugin_confi
[trafficserver] branch master updated: Add support for request/response transform for Wasm plugin (#10004)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 5992676e6a Add support for request/response transform for Wasm plugin (#10004) 5992676e6a is described below commit 5992676e6a3902052c8166c45b40cc123bacfb2f Author: Kit Chan AuthorDate: Fri Jul 28 11:41:07 2023 -0700 Add support for request/response transform for Wasm plugin (#10004) * Add support for request/response transform * fix clang format error * fix clang format error * fix clang format error * use bool and fix a redundant statement * fix transform_handler() signature and add comments on EOS handling --- doc/admin-guide/plugins/wasm.en.rst| 1 - plugins/experimental/wasm/ats_context.cc | 18 +- plugins/experimental/wasm/ats_context.h| 99 .../experimental/wasm/examples/transform/Makefile | 22 ++ .../experimental/wasm/examples/transform/README.md | 9 + .../wasm/examples/transform/transform.cc | 70 ++ .../wasm/examples/transform/transform.yaml | 24 ++ plugins/experimental/wasm/wasm_main.cc | 263 + 8 files changed, 504 insertions(+), 2 deletions(-) diff --git a/doc/admin-guide/plugins/wasm.en.rst b/doc/admin-guide/plugins/wasm.en.rst index 642c49fb83..cf92af6157 100644 --- a/doc/admin-guide/plugins/wasm.en.rst +++ b/doc/admin-guide/plugins/wasm.en.rst @@ -103,7 +103,6 @@ TODO * Currently only the WAMR and WasmEdge runtime is supported. We should also support V8 and Wasmtime later. -* Need to support functionality for retrieving and setting request/response body * Need to support L4 lifecycle handler functions Limitations diff --git a/plugins/experimental/wasm/ats_context.cc b/plugins/experimental/wasm/ats_context.cc index b3de641091..63a44e0f7c 100644 --- a/plugins/experimental/wasm/ats_context.cc +++ b/plugins/experimental/wasm/ats_context.cc @@ -291,6 +291,20 @@ set_header(TSMBuffer bufp, TSMLoc hdr_loc, std::string_view v, std::string_view } } +// Buffer copyTo +WasmResult +Buffer::copyTo(WasmBase *wasm, size_t start, size_t length, uint64_t ptr_ptr, uint64_t size_ptr) const +{ + if (owned_data_str_ != "") { +std::string_view s(owned_data_str_); +if (!wasm->copyToPointerSize(s, ptr_ptr, size_ptr)) { + return WasmResult::InvalidMemoryAccess; +} +return WasmResult::Ok; + } + return BufferBase::copyTo(wasm, start, length, ptr_ptr, size_ptr); +} + Context::Context() : ContextBase() {} Context::Context(Wasm *wasm) : ContextBase(wasm) {} @@ -511,9 +525,11 @@ Context::getBuffer(WasmBufferType type) return buffer_.set(std::string(static_cast(cr_body_), cr_body_size_)); } return buffer_.set(""); - case WasmBufferType::CallData: case WasmBufferType::HttpRequestBody: case WasmBufferType::HttpResponseBody: +// return transform result +return _result_; + case WasmBufferType::CallData: case WasmBufferType::NetworkDownstreamData: case WasmBufferType::NetworkUpstreamData: case WasmBufferType::GrpcReceiveBuffer: diff --git a/plugins/experimental/wasm/ats_context.h b/plugins/experimental/wasm/ats_context.h index fdf18ddbe9..96a8a7b9c5 100644 --- a/plugins/experimental/wasm/ats_context.h +++ b/plugins/experimental/wasm/ats_context.h @@ -47,6 +47,7 @@ const int FETCH_EVENT_ID_BASE = 1; using proxy_wasm::ContextBase; using proxy_wasm::PluginBase; +using proxy_wasm::WasmBase; using proxy_wasm::WasmResult; using proxy_wasm::WasmStreamType; using proxy_wasm::BufferInterface; @@ -138,6 +139,55 @@ struct HeaderMap { } }; +// extended BufferBase +class Buffer : public BufferBase +{ +public: + Buffer() { owned_data_str_ = ""; } + ~Buffer() override = default; + + size_t + size() const override + { +if (owned_data_str_ != "") { + return owned_data_str_.size(); +} +return BufferBase::size(); + } + + WasmResult copyTo(WasmBase *wasm, size_t start, size_t length, uint64_t ptr_ptr, uint64_t size_ptr) const override; + + WasmResult + copyFrom(size_t start, size_t length, std::string_view data) override + { +owned_data_str_.replace(start, length, data); +return WasmResult::Ok; + } + + void + clear() override + { +owned_data_str_ = ""; +BufferBase::clear(); + } + + BufferBase * + set(std::string data) + { +owned_data_str_ = owned_data_str_ + data; +return this; + } + + std::string + get() + { +return owned_data_str_; + } + +private: + std::string owned_data_str_; +}; + class Context : public ContextBase { public: @@ -202,6 +252,33 @@ public: cr_result_= (TSEvent)(FETCH_EVENT_ID_BASE + 1); } + // transform result functions + void + cle
[trafficserver] branch master updated: Use of uninitialized variables reported by oss-fuzz (#10068)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new f286fe8603 Use of uninitialized variables reported by oss-fuzz (#10068) f286fe8603 is described below commit f286fe86031d08fdf92928deb6ac91ba8662bc75 Author: Kit Chan AuthorDate: Fri Jul 21 09:30:43 2023 -0700 Use of uninitialized variables reported by oss-fuzz (#10068) * initialize variables reported by oss-fuzz * fix according to comments --- src/tscore/Regex.cc | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tscore/Regex.cc b/src/tscore/Regex.cc index e8195f0de2..22bb2e1c9e 100644 --- a/src/tscore/Regex.cc +++ b/src/tscore/Regex.cc @@ -55,10 +55,10 @@ Regex::Regex(Regex &) noexcept : regex(that.regex), regex_extra(that.regex_ bool Regex::compile(const char *pattern, const unsigned flags) { - const char *error; - int erroffset; - int options= 0; - int study_opts = 0; + const char *error = nullptr; + int erroffset = 0; + int options = 0; + int study_opts= 0; if (regex) { return false;
[trafficserver] branch master updated: Add support for async requests for wasm plugin (#9896)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new a2e8615bd8 Add support for async requests for wasm plugin (#9896) a2e8615bd8 is described below commit a2e8615bd816731db7731204265228e6176a4b87 Author: Kit Chan AuthorDate: Mon Jul 10 16:28:18 2023 -0700 Add support for async requests for wasm plugin (#9896) * Add support for async requests for wasm plugin * Add wasm plugin async example * fix typo * fix typo * fix format issues * fix format issues * update documentation * Documentation change and add function to mark transaction already reenabled * fix typo * simplify the case statements for getting header map --- doc/admin-guide/plugins/wasm.en.rst| 4 +- plugins/experimental/wasm/ats_context.cc | 191 - plugins/experimental/wasm/ats_context.h| 71 plugins/experimental/wasm/examples/async/Makefile | 22 +++ plugins/experimental/wasm/examples/async/README.md | 13 ++ plugins/experimental/wasm/examples/async/async.cc | 85 + .../experimental/wasm/examples/async/async.yaml| 24 +++ plugins/experimental/wasm/wasm_main.cc | 40 - 8 files changed, 435 insertions(+), 15 deletions(-) diff --git a/doc/admin-guide/plugins/wasm.en.rst b/doc/admin-guide/plugins/wasm.en.rst index 9b83b8b8ee..642c49fb83 100644 --- a/doc/admin-guide/plugins/wasm.en.rst +++ b/doc/admin-guide/plugins/wasm.en.rst @@ -102,9 +102,8 @@ The plugin can also take more than one yaml file as arguments and can thus load TODO -* Currently only the WAMR and WasmEdge runtime is supported. We should also support V8 and Wasmtime. +* Currently only the WAMR and WasmEdge runtime is supported. We should also support V8 and Wasmtime later. * Need to support functionality for retrieving and setting request/response body -* Need to support functionality for making async request call * Need to support L4 lifecycle handler functions Limitations @@ -114,5 +113,6 @@ The plugin will not support the following functionality as specified in Proxy-Wa * Getting and setting trailer request and response header * Getting and setting HTTP/2 frame meta data +* Support asynchronous request call in the start handler function of the plugin lifecycle * Support on Grpc lifecycle handler functions diff --git a/plugins/experimental/wasm/ats_context.cc b/plugins/experimental/wasm/ats_context.cc index e69099cb33..b3de641091 100644 --- a/plugins/experimental/wasm/ats_context.cc +++ b/plugins/experimental/wasm/ats_context.cc @@ -33,6 +33,83 @@ namespace ats_wasm { + +static int +async_handler(TSCont cont, TSEvent event, void *edata) +{ + // information for the handler + TSHttpTxn txn = static_cast(edata); + AsyncInfo *ai = (AsyncInfo *)TSContDataGet(cont); + uint32_t token= ai->token; + Context *root_context = ai->root_context; + Wasm *wasm= root_context->wasm(); + + // variables to be used in handler + TSEvent result= (TSEvent)(FETCH_EVENT_ID_BASE + 1); + const void *body = nullptr; + size_t body_size = 0; + TSMBuffer hdr_buf = nullptr; + TSMLoc hdr_loc= nullptr; + int header_size = 0; + + TSMutexLock(wasm->mutex()); + // filling in variables for a successful fetch + if (event == static_cast(FETCH_EVENT_ID_BASE)) { +int data_len; +const char *data_start = TSFetchRespGet(txn, _len); +if (data_start && (data_len > 0)) { + const char *data_end = data_start + data_len; + TSHttpParser parser = TSHttpParserCreate(); + hdr_buf = TSMBufferCreate(); + hdr_loc = TSHttpHdrCreate(hdr_buf); + TSHttpHdrTypeSet(hdr_buf, hdr_loc, TS_HTTP_TYPE_RESPONSE); + if (TSHttpHdrParseResp(parser, hdr_buf, hdr_loc, _start, data_end) == TS_PARSE_DONE) { +TSHttpStatus status = TSHttpHdrStatusGet(hdr_buf, hdr_loc); +header_size = TSMimeHdrFieldsCount(hdr_buf, hdr_loc); +body= data_start; // data_start will now be pointing to body +body_size = data_end - data_start; +TSDebug(WASM_DEBUG_TAG, "[%s] Fetch result had a status code of %d with a body length of %ld", __FUNCTION__, status, +body_size); + } else { +TSError("[wasm][%s] Unable to parse call response", __FUNCTION__); +event = static_cast(FETCH_EVENT_ID_BASE + 1); + } + TSHttpParserDestroy(parser); +} else { + TSError("[wasm][%s] Successful fetch did not result in any content. Assuming failure", __FUNCTION__); + event = static_cast(FETCH_EVENT_ID_BASE + 1); +} +result = event; + } + + // callb
[trafficserver] branch master updated (a61bccfe24 -> 652e084593)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from a61bccfe24 Remove unused global g_socks_conf_stuff. (#9823) add 652e084593 fix: memory leak when using modsecurity (#9798) No new revisions were added by this update. Summary of changes: example/plugins/lua-api/modsecurity/ats-luajit-modsecurity.lua | 5 + 1 file changed, 5 insertions(+)
[trafficserver] branch master updated (80444908ae -> 671c3609b8)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 80444908ae Remove old header (#9727) add 671c3609b8 Add support for TS_HTTP_REQUEST_CLIENT/TS_HTTP_RESPONSE_CLIENT for lua plugin (#9682) No new revisions were added by this update. Summary of changes: doc/admin-guide/plugins/lua.en.rst | 8 + .../lua/example/test_request_client.lua| 26 +-- .../lua/example/test_response_client.lua | 12 +- plugins/lua/ts_lua_hook.c | 18 ++ plugins/lua/ts_lua_transform.c | 222 + plugins/lua/ts_lua_transform.h | 1 + .../gold_tests/pluginTest/lua/client_hook.lua | 13 +- ...a_watermark.test.py => lua_client_hook.test.py} | 10 +- 8 files changed, 274 insertions(+), 36 deletions(-) copy example/plugins/lua-api/reqbody.lua => plugins/lua/example/test_request_client.lua (67%) copy tests/gold_tests/pluginTest/lua/global.lua => plugins/lua/example/test_response_client.lua (85%) copy plugins/lua/example/test_closure.lua => tests/gold_tests/pluginTest/lua/client_hook.lua (84%) copy tests/gold_tests/pluginTest/lua/{lua_watermark.test.py => lua_client_hook.test.py} (86%)
[trafficserver-ingress-controller] branch master updated: Bump requests from 2.27.1 to 2.31.0 in /tests (#168)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 1cf9a71 Bump requests from 2.27.1 to 2.31.0 in /tests (#168) 1cf9a71 is described below commit 1cf9a717393f126ed53cacbbc07635fa82e4aa5a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 22 21:33:27 2023 -0700 Bump requests from 2.27.1 to 2.31.0 in /tests (#168) Bumps [requests](https://github.com/psf/requests) from 2.27.1 to 2.31.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.27.1...v2.31.0) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index c57bfd6..812592e 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,3 @@ pytest==5.4.3 -requests==2.27.1 +requests==2.31.0 urllib3==1.26.5
[trafficserver-ingress-controller] branch master updated: Rollback to 1.19.8
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new cf0d02d Rollback to 1.19.8 cf0d02d is described below commit cf0d02d3c876d94aa64841afa7f164cee0b45587 Author: Kit Chan AuthorDate: Mon May 15 14:44:22 2023 -0700 Rollback to 1.19.8 --- GO_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GO_VERSION b/GO_VERSION index 91c48c0..6681c8c 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.19.9 +1.19.8
[trafficserver-ingress-controller] branch master updated: Upgrade to Go 1.19.9 (#167)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new cf2c8fc Upgrade to Go 1.19.9 (#167) cf2c8fc is described below commit cf2c8fcc6f7e8ebd8fbb3e8f42a33da8dcb15db3 Author: Kit Chan AuthorDate: Mon May 15 12:21:12 2023 -0700 Upgrade to Go 1.19.9 (#167) --- GO_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GO_VERSION b/GO_VERSION index 6681c8c..91c48c0 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.19.8 +1.19.9
[trafficserver-ingress-controller] branch master updated: Upgrade to go 1.19.8 (#166)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new e6b42ab Upgrade to go 1.19.8 (#166) e6b42ab is described below commit e6b42abe205214fafb4064a3f7962e90823b64e0 Author: Kit Chan AuthorDate: Sun Apr 16 21:54:02 2023 -0700 Upgrade to go 1.19.8 (#166) --- GO_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GO_VERSION b/GO_VERSION index 98adfe8..6681c8c 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.19.7 +1.19.8
[trafficserver-ingress-controller] branch master updated: Upgrade Alpine linux to 3.16.5 (#165)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 680aae3 Upgrade Alpine linux to 3.16.5 (#165) 680aae3 is described below commit 680aae3dd118ecefb05f6cf30f0bc367cb1d3d53 Author: Kit Chan AuthorDate: Sun Apr 2 00:10:12 2023 -0700 Upgrade Alpine linux to 3.16.5 (#165) --- Dockerfile | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23ec7a7..77e4831 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -FROM alpine:3.16.4 as builder +FROM alpine:3.16.5 as builder RUN apk add --no-cache --virtual .tools \ bzip2 curl git automake libtool autoconf make sed file perl openrc openssl @@ -123,7 +123,7 @@ RUN mkdir -p /opt/ats/var/run/redis/ \ # set up ingress log location RUN mkdir -p /opt/ats/var/log/ingress/ -FROM alpine:3.16.4 +FROM alpine:3.16.5 # essential library RUN apk add --no-cache -U \ diff --git a/README.md b/README.md index d72d82a..3ce2250 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md) ## Versions of Software Used -- Alpine Linux 3.16.4 +- Alpine Linux 3.16.5 - Apache Traffic Server 9.2.0 - LuaJIT 2.0.4 - Go (Version can be found in `GO_VERSION` file found at the base of this repository)
[trafficserver-ingress-controller] branch master updated: Fix problem with lua plugin (#164)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new 12c7f26 Fix problem with lua plugin (#164) 12c7f26 is described below commit 12c7f261d66c42d3b28431c541e552dd10a5fb69 Author: Kit Chan AuthorDate: Mon Mar 27 23:00:13 2023 -0700 Fix problem with lua plugin (#164) * fix lua plugin problem * fix typo --- Dockerfile | 2 +- config/plugin.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4e01ef..23ec7a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -89,7 +89,7 @@ COPY ["./namespace/", "$GOPATH/src/github.com/apache/trafficserver-ingress-contr COPY ["./endpoint/", "$GOPATH/src/github.com/apache/trafficserver-ingress-controller/endpoint"] COPY ["./util/", "$GOPATH/src/github.com/apache/trafficserver-ingress-controller/util"] COPY ["./watcher/", "$GOPATH/src/github.com/apache/trafficserver-ingress-controller/watcher"] -COPY ["./pluginats/", "$GOPATH/src/github.com/apache/trafficserver-ingress-controller/pluginats"] +COPY ["./pluginats/", "/opt/ats/var/pluginats"] COPY ["./redis/", "$GOPATH/src/github.com/apache/trafficserver-ingress-controller/redis"] COPY ["./go.mod", "$GOPATH/src/github.com/apache/trafficserver-ingress-controller/go.mod"] COPY ["./go.sum", "$GOPATH/src/github.com/apache/trafficserver-ingress-controller/go.sum"] diff --git a/config/plugin.config b/config/plugin.config index aa4464b..48a0f8a 100644 --- a/config/plugin.config +++ b/config/plugin.config @@ -15,5 +15,5 @@ # limitations under the License. healthchecks.so /opt/ats/etc/trafficserver/healthchecks.config -tslua.so /opt/ats/go/bin/src/github.com/apache/trafficserver-ingress-controller/pluginats/connect_redis.lua +tslua.so /opt/ats/var/pluginats/connect_redis.lua stats_over_http.so
[trafficserver-ingress-controller] branch master updated: Relocate controller program (#163)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git The following commit(s) were added to refs/heads/master by this push: new fa99174 Relocate controller program (#163) fa99174 is described below commit fa99174642d548d66351ae4014fc62e578c109ca Author: Kit Chan AuthorDate: Mon Mar 27 11:25:01 2023 -0700 Relocate controller program (#163) --- Dockerfile | 3 ++- bin/entry.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b2a46d..a4e01ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -97,8 +97,9 @@ COPY ["./go.sum", "$GOPATH/src/github.com/apache/trafficserver-ingress-controlle # Building Project Main WORKDIR /opt/ats/go/bin/src/github.com/apache/trafficserver-ingress-controller ENV GO111MODULE=on -RUN /opt/ats/go/bin/go build -o ingress_ats main/main.go +RUN /opt/ats/go/bin/go build -o /opt/ats/bin/ingress_ats main/main.go RUN /opt/ats/go/bin/go clean -modcache +RUN rm -rf /opt/ats/go # redis conf COPY ["./config/redis.conf", "/opt/ats/etc/redis.conf"] diff --git a/bin/entry.sh b/bin/entry.sh index 1c69bee..16fd10c 100755 --- a/bin/entry.sh +++ b/bin/entry.sh @@ -49,7 +49,7 @@ if [ -z "${RESYNC_PERIOD}" ]; then fi if [ -z "${INGRESS_DEBUG}" ]; then - /opt/ats/go/bin/src/github.com/apache/trafficserver-ingress-controller/ingress_ats -atsIngressClass="$INGRESS_CLASS" -atsNamespace="$POD_NAMESPACE" -namespaces="$INGRESS_NS" -ignoreNamespaces="$INGRESS_IGNORE_NS" -useInClusterConfig=T -resyncPeriod="$RESYNC_PERIOD" + /opt/ats/bin/ingress_ats -atsIngressClass="$INGRESS_CLASS" -atsNamespace="$POD_NAMESPACE" -namespaces="$INGRESS_NS" -ignoreNamespaces="$INGRESS_IGNORE_NS" -useInClusterConfig=T -resyncPeriod="$RESYNC_PERIOD" else - /opt/ats/go/bin/src/github.com/apache/trafficserver-ingress-controller/ingress_ats -atsIngressClass="$INGRESS_CLASS" -atsNamespace="$POD_NAMESPACE" -namespaces="$INGRESS_NS" -ignoreNamespaces="$INGRESS_IGNORE_NS" -useInClusterConfig=T -resyncPeriod="$RESYNC_PERIOD" 2>>/opt/ats/var/log/ingress/ingress_ats.err + /opt/ats/bin/ingress_ats -atsIngressClass="$INGRESS_CLASS" -atsNamespace="$POD_NAMESPACE" -namespaces="$INGRESS_NS" -ignoreNamespaces="$INGRESS_IGNORE_NS" -useInClusterConfig=T -resyncPeriod="$RESYNC_PERIOD" 2>>/opt/ats/var/log/ingress/ingress_ats.err fi
[trafficserver] branch master updated: Add support for multiple yaml config files for wasm plugin (#9483)
This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new a5b1dd2e4 Add support for multiple yaml config files for wasm plugin (#9483) a5b1dd2e4 is described below commit a5b1dd2e40aff3d391df91e8be744cb87520c141 Author: Kit Chan AuthorDate: Sun Mar 26 07:56:47 2023 -0700 Add support for multiple yaml config files for wasm plugin (#9483) * Add support for multiple yaml config files * fix clang-format issues * fix clang-format issues * Update wasm.en.rst * Fix problem with breaks and add error message related to file read --- doc/admin-guide/plugins/wasm.en.rst| 3 +- plugins/experimental/wasm/wasm_main.cc | 502 ++--- 2 files changed, 275 insertions(+), 230 deletions(-) diff --git a/doc/admin-guide/plugins/wasm.en.rst b/doc/admin-guide/plugins/wasm.en.rst index ec129cbbe..9b83b8b8e 100644 --- a/doc/admin-guide/plugins/wasm.en.rst +++ b/doc/admin-guide/plugins/wasm.en.rst @@ -97,6 +97,8 @@ generated wasm modules with the plugin. Runtime can be chosen by changing the ``runtime`` field inside the yaml configuration file for the plugin. ``ats.wasm.runtime.wamr`` is for WAMR while ``ats.wasm.runtime.wasmedge`` is for WasmEdge. +The plugin can also take more than one yaml file as arguments and can thus load more than one wasm modules. + TODO @@ -104,7 +106,6 @@ TODO * Need to support functionality for retrieving and setting request/response body * Need to support functionality for making async request call * Need to support L4 lifecycle handler functions -* Support loading more than one Wasm module Limitations === diff --git a/plugins/experimental/wasm/wasm_main.cc b/plugins/experimental/wasm/wasm_main.cc index c9ac17e26..5267914db 100644 --- a/plugins/experimental/wasm/wasm_main.cc +++ b/plugins/experimental/wasm/wasm_main.cc @@ -37,10 +37,9 @@ // struct for storing plugin configuration struct WasmInstanceConfig { - std::string config_filename; - std::string wasm_filename; - std::shared_ptr wasm = nullptr; - std::shared_ptr plugin = nullptr; + std::list config_filenames = {}; + + std::list, std::shared_ptr>> configs = {}; std::list, std::shared_ptr>> deleted_configs = {}; }; @@ -60,23 +59,31 @@ schedule_handler(TSCont contp, TSEvent /*event*/, void * /*data*/) c->onTick(0); // use 0 as token - if (!wasm_config->wasm) { -TSError("[wasm][%s] Configuration object is null", __FUNCTION__); + if (wasm_config->configs.empty()) { +TSError("[wasm][%s] Configuration objects are empty", __FUNCTION__); TSMutexUnlock(old_wasm->mutex()); return 0; } - if (c->wasm() == wasm_config->wasm.get()) { -auto *wasm = static_cast(c->wasm()); -uint32_t root_context_id = c->id(); -if (wasm->existsTimerPeriod(root_context_id)) { - TSDebug(WASM_DEBUG_TAG, "[%s] reschedule continuation", __FUNCTION__); - std::chrono::milliseconds period = wasm->getTimerPeriod(root_context_id); - TSContScheduleOnPool(contp, static_cast(period.count()), TS_THREAD_POOL_NET); -} else { - TSDebug(WASM_DEBUG_TAG, "[%s] can't find period for root context id: %d", __FUNCTION__, root_context_id); + bool found = false; + for (auto it = wasm_config->configs.begin(); it != wasm_config->configs.end(); it++) { +std::shared_ptr wbp = it->first; +if (wbp.get() == old_wasm) { + found= true; + auto *wasm = static_cast(c->wasm()); + uint32_t root_context_id = c->id(); + if (wasm->existsTimerPeriod(root_context_id)) { +TSDebug(WASM_DEBUG_TAG, "[%s] reschedule continuation", __FUNCTION__); +std::chrono::milliseconds period = wasm->getTimerPeriod(root_context_id); +TSContScheduleOnPool(contp, static_cast(period.count()), TS_THREAD_POOL_NET); + } else { +TSDebug(WASM_DEBUG_TAG, "[%s] can't find period for root context id: %d", __FUNCTION__, root_context_id); + } + break; } - } else { + } + + if (!found) { std::shared_ptr temp = nullptr; uint32_t root_context_id = c->id(); old_wasm->removeTimerPeriod(root_context_id); @@ -181,11 +188,20 @@ http_event_handler(TSCont contp, TSEvent event, void *data) case TS_EVENT_HTTP_READ_CACHE_HDR: break; - case TS_EVENT_HTTP_TXN_CLOSE: + case TS_EVENT_HTTP_TXN_CLOSE: { context->onDone(); context->onDelete(); -if (context->wasm() == wasm_config->wasm.get()) { +bool found = false; +for (auto it = wasm_config->configs.begin(); it != wasm_config->configs.end(); it++) { +