From f21c5ff055e9108d186576cac27bb9639b0e127a Mon Sep 17 00:00:00 2001 From: Antonette Caldwell Date: Mon, 12 Sep 2022 21:43:58 -0500 Subject: [PATCH 1/2] Proposing an upgrade on upstream from go1.13 to 1.19 Signed-off-by: Antonette Caldwell --- upstream/Dockerfile | 4 +++- upstream/go.mod | 3 +++ upstream/main.go | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 upstream/go.mod diff --git a/upstream/Dockerfile b/upstream/Dockerfile index 077f426..4e51431 100644 --- a/upstream/Dockerfile +++ b/upstream/Dockerfile @@ -1,4 +1,6 @@ -FROM golang:1.13.5 as bd +# syntax=docker/dockerfile:1 + +FROM golang:1.19.1 as bd WORKDIR /github.com/layer5io/wasm-upstream ADD . . RUN GOPROXY=direct GOSUMDB=off go build -a -o /upstream . diff --git a/upstream/go.mod b/upstream/go.mod new file mode 100644 index 0000000..b4fec42 --- /dev/null +++ b/upstream/go.mod @@ -0,0 +1,3 @@ +module github.com/layer5io/wasm-filters/upstream + +go 1.19 diff --git a/upstream/main.go b/upstream/main.go index cbbda9f..ae3fd62 100644 --- a/upstream/main.go +++ b/upstream/main.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "io/ioutil" + "io" "net/http" ) @@ -10,7 +10,7 @@ var gldata = "" func store(w http.ResponseWriter, req *http.Request) { defer req.Body.Close() - data, err := ioutil.ReadAll(req.Body) + data, err := io.ReadAll(req.Body) if err != nil { return } From 3f82ebdb5b658a0538404b82337765f8e96932da Mon Sep 17 00:00:00 2001 From: Antonette Caldwell Date: Mon, 12 Sep 2022 21:49:33 -0500 Subject: [PATCH 2/2] Upgrade istio/proxyv2 to 1.13.8 Signed-off-by: Antonette Caldwell --- envoy.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoy.Dockerfile b/envoy.Dockerfile index 3962a8c..2c8615f 100644 --- a/envoy.Dockerfile +++ b/envoy.Dockerfile @@ -1,2 +1,2 @@ -FROM istio/proxyv2:1.12.0-rc.1 +FROM istio/proxyv2:1.13.8 ENTRYPOINT /usr/local/bin/envoy -c /etc/envoy.yaml -l debug --service-cluster proxy