Skip to content

Commit 1068b0d

Browse files
LionelJouinLionelJouin
authored
Merge pull request #242 from Nordix/golang-version
Update to Golang 1.19
2 parents 7e375e6 + 3fcca89 commit 1068b0d

File tree

11 files changed

+76
-259
lines changed

11 files changed

+76
-259
lines changed

‎build/ctraffic/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG USER=tapa-user
22
ARG UID=10006
33
ARG HOME=/home/${USER}
44

5-
FROM golang:1.18.1 as build
5+
FROM golang:1.19.0 as build
66

77
ENV GO111MODULE=on
88

‎build/frontend/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10001
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.18.1 as build
6+
FROM golang:1.19.0 as build
77

88
ENV GO111MODULE=on
99
ENV CGO_ENABLED=0

‎build/ipam/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10004
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.18.1 as build
6+
FROM golang:1.19.0 as build
77

88
ENV GO111MODULE=on
99
ARG meridio_version=0.0.0-unknown

‎build/load-balancer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10002
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.18.1 as build
6+
FROM golang:1.19.0 as build
77
ARG meridio_version=0.0.0-unknown
88
ENV GO111MODULE=on
99

‎build/nsp/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10003
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.18.1 as build
6+
FROM golang:1.19.0 as build
77

88
ARG meridio_version=0.0.0-unknown
99
ENV GO111MODULE=on

‎build/proxy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=meridio
33
ARG UID=10005
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.18.1 as build
6+
FROM golang:1.19.0 as build
77

88
ARG meridio_version=0.0.0-unknown
99
ENV GO111MODULE=on

‎build/tapa/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG USER=tapa
33
ARG UID=10005
44
ARG HOME=/home/${USER}
55

6-
FROM golang:1.18.1 as build
6+
FROM golang:1.19.0 as build
77

88
ARG meridio_version=0.0.0-unknown
99
ENV GO111MODULE=on

‎go.mod

+64-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/nordix/meridio
22

3-
go 1.16
3+
go 1.19
44

55
require (
66
github.com/antonfisher/nested-logrus-formatter v1.3.1
@@ -35,10 +35,73 @@ require (
3535
)
3636

3737
require (
38+
github.com/OneOfOne/xxhash v1.2.8 // indirect
39+
github.com/bytecodealliance/wasmtime-go v0.28.0 // indirect
40+
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
41+
github.com/davecgh/go-spew v1.1.1 // indirect
42+
github.com/edwarnicke/serialize v1.0.7 // indirect
43+
github.com/fsnotify/fsnotify v1.5.1 // indirect
44+
github.com/ghodss/yaml v1.0.0 // indirect
45+
github.com/go-logr/logr v1.2.1 // indirect
46+
github.com/go-logr/stdr v1.2.0 // indirect
47+
github.com/gobwas/glob v0.2.3 // indirect
48+
github.com/gogo/protobuf v1.3.2 // indirect
49+
github.com/golang-jwt/jwt/v4 v4.1.0 // indirect
50+
github.com/google/go-cmp v0.5.6 // indirect
3851
github.com/google/gofuzz v1.2.0 // indirect
52+
github.com/googleapis/gnostic v0.5.5 // indirect
53+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
54+
github.com/imdario/mergo v0.3.12 // indirect
55+
github.com/jinzhu/inflection v1.0.0 // indirect
3956
github.com/jinzhu/now v1.1.3 // indirect
57+
github.com/json-iterator/go v1.1.12 // indirect
58+
github.com/koneu/natend v0.0.0-20150829182554-ec0926ea948d // indirect
59+
github.com/mattn/go-sqlite3 v1.14.9 // indirect
60+
github.com/mdlayher/netlink v0.0.0-20191009155606-de872b0d824b // indirect
61+
github.com/moby/spdystream v0.2.0 // indirect
62+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
63+
github.com/modern-go/reflect2 v1.0.2 // indirect
64+
github.com/nxadm/tail v1.4.8 // indirect
4065
github.com/open-policy-agent/opa v0.30.1 // indirect
66+
github.com/pmezard/go-difflib v1.0.0 // indirect
67+
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
68+
github.com/spf13/pflag v1.0.5 // indirect
69+
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
70+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
71+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
72+
github.com/yashtewari/glob-intersection v0.0.0-20180916065949-5c77d914dd0b // indirect
73+
github.com/zeebo/errs v1.2.2 // indirect
74+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.27.0 // indirect
75+
go.opentelemetry.io/otel v1.3.0 // indirect
76+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0 // indirect
77+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.26.0 // indirect
78+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.26.0 // indirect
79+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0 // indirect
80+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0 // indirect
81+
go.opentelemetry.io/otel/internal/metric v0.26.0 // indirect
82+
go.opentelemetry.io/otel/metric v0.26.0 // indirect
83+
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
84+
go.opentelemetry.io/otel/sdk/export/metric v0.26.0 // indirect
85+
go.opentelemetry.io/otel/sdk/metric v0.26.0 // indirect
86+
go.opentelemetry.io/otel/trace v1.3.0 // indirect
87+
go.opentelemetry.io/proto/otlp v0.11.0 // indirect
4188
go.uber.org/atomic v1.8.0 // indirect
89+
golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 // indirect
90+
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
91+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
92+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
93+
golang.org/x/text v0.3.7 // indirect
94+
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
95+
google.golang.org/appengine v1.6.7 // indirect
96+
google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12 // indirect
97+
gopkg.in/inf.v0 v0.9.1 // indirect
4298
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
99+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
100+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
43101
k8s.io/klog/v2 v2.40.1 // indirect
102+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
103+
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
104+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
105+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
106+
sigs.k8s.io/yaml v1.3.0 // indirect
44107
)

0 commit comments

Comments
 (0)