You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ki...@apache.org on 2022/03/29 07:36:37 UTC
[trafficserver-ingress-controller] branch master updated: Move helm chart README.md, upgrade golang.org/x/text and luasocket (#109)
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 3694414 Move helm chart README.md, upgrade golang.org/x/text and luasocket (#109)
3694414 is described below
commit 3694414dda541aad8536aa97d1e3b7d48a95830b
Author: Kit Chan <ki...@apache.org>
AuthorDate: Tue Mar 29 00:36:32 2022 -0700
Move helm chart README.md, upgrade golang.org/x/text and luasocket (#109)
* Move helm chart README.md. Upgrade golang.org/x/text. Upgrade luasocket
* fix typo
---
Dockerfile | 6 +++---
README.md | 2 +-
charts/{ => ats-ingress}/README.md | 0
docs/TUTORIAL.md | 2 +-
docs/ats-ingress-0.1.0.tgz | Bin 5111 -> 5653 bytes
docs/index.yaml | 6 +++---
go.mod | 1 +
go.sum | 2 ++
8 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 40e86ed..482ee2f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,9 +50,9 @@ RUN sed -i "s/TM_DAEMON_ARGS=\"\"/TM_DAEMON_ARGS=\" --bind_stdout \/opt\/ats\/va
RUN sed -i "s/TS_DAEMON_ARGS=\"\"/TS_DAEMON_ARGS=\" --bind_stdout \/opt\/ats\/var\/log\/trafficserver\/traffic.out --bind_stderr \/opt\/ats\/var\/log\/trafficserver\/traffic.out \"/" /opt/ats/bin/trafficserver
# luasocket
-RUN wget https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz \
- && tar zxf v3.0-rc1.tar.gz \
- && cd luasocket-3.0-rc1 \
+RUN wget https://github.com/lunarmodules/luasocket/archive/refs/tags/v3.0.0.tar.gz \
+ && tar zxf v3.0.0.tar.gz \
+ && cd luasocket-3.0.0 \
&& sed -i "s/LDFLAGS_linux=-O -shared -fpic -o/LDFLAGS_linux=-O -shared -fpic -L\/usr\/lib -lluajit-5.1 -o/" src/makefile \
&& ln -sf /usr/lib/libluajit-5.1.so.2.1.0 /usr/lib/libluajit-5.1.so \
&& mkdir -p /usr/include/lua \
diff --git a/README.md b/README.md
index 7e95cf7..b0f0159 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,6 @@ ATS Kubernetes Ingress Controller
- LuaJIT 2.0.4
- Go 1.17.8
- Other Packages
- - luasocket 3.0rc1
+ - luasocket 3.0.0
- redis-lua 2.0.4
diff --git a/charts/README.md b/charts/ats-ingress/README.md
similarity index 100%
rename from charts/README.md
rename to charts/ats-ingress/README.md
diff --git a/docs/TUTORIAL.md b/docs/TUTORIAL.md
index 9ac77d3..77ed667 100644
--- a/docs/TUTORIAL.md
+++ b/docs/TUTORIAL.md
@@ -181,5 +181,5 @@ Use the following steps to install [Prometheus](https://prometheus.io/docs/prome
### Helm Chart
-Helm Chart is provided. You can delete the namespace of `trafficserver-test` and `monitoring-layer` created above and continue the tutorial by following instructions [here](../charts/README.md). The curl commands [here](#checking-results) will continue to work.
+Helm Chart is provided. You can delete the namespace of `trafficserver-test` and `monitoring-layer` created above and continue the tutorial by following instructions [here](../charts/ats-ingress/README.md). The curl commands [here](#checking-results) will continue to work.
diff --git a/docs/ats-ingress-0.1.0.tgz b/docs/ats-ingress-0.1.0.tgz
index 25bd6e2..dd40f50 100644
Binary files a/docs/ats-ingress-0.1.0.tgz and b/docs/ats-ingress-0.1.0.tgz differ
diff --git a/docs/index.yaml b/docs/index.yaml
index 5e716dc..399c0a5 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -3,12 +3,12 @@ entries:
ats-ingress:
- apiVersion: v2
appVersion: 0.1.0
- created: "2021-05-26T16:16:45.441455-07:00"
+ created: "2022-03-29T00:27:12.614941-07:00"
description: A Helm chart for Kubernetes
- digest: c892ccd1876b1634b7d76a11d0388c1e22bf11e5c89b29af9407511bd6644538
+ digest: 2c6fce94d029ecc3b2c5e9d9dcdf0918127312dbc67647c19023bb209cc123e6
name: ats-ingress
type: application
urls:
- https://apache.github.io/trafficserver-ingress-controller/ats-ingress-0.1.0.tgz
version: 0.1.0
-generated: "2021-05-26T16:16:45.440577-07:00"
+generated: "2022-03-29T00:27:12.609436-07:00"
diff --git a/go.mod b/go.mod
index 119df47..3acab92 100644
--- a/go.mod
+++ b/go.mod
@@ -6,6 +6,7 @@ require (
github.com/alicebob/miniredis/v2 v2.13.0
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/go-redis/redis v6.15.2+incompatible
+ golang.org/x/text v0.3.7 // indirect
k8s.io/api v0.21.9
k8s.io/apimachinery v0.21.9
k8s.io/client-go v0.21.9
diff --git a/go.sum b/go.sum
index 0a63064..279d4fe 100644
--- a/go.sum
+++ b/go.sum
@@ -354,6 +354,8 @@ 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.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=