Skip to content

Commit

Permalink
update go
Browse files Browse the repository at this point in the history 
Signed-off-by: Alice Wasko <[email protected]>
  • Loading branch information
@Alice-Lilith
Alice Wasko authored and Alice-Lilith committed Jun 7, 2024
1 parent 8b343d5 commit 1c96a9d
Show file tree
Hide file tree
Showing 16 changed files with 305 additions and 146 deletions.
47 changes: 24 additions & 23 deletions DEPENDENCIES.md
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docker/base-python/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN apk --no-cache add \
# 'python3' versions above.
RUN pip3 install "Cython<3.0" pip-tools==7.3

RUN curl --fail -L https://dl.google.com/go/go1.21.10.linux-amd64.tar.gz | tar -C /usr/local -xzf -
RUN curl --fail -L https://dl.google.com/go/go1.22.4.linux-amd64.tar.gz | tar -C /usr/local -xzf -

# The YAML parser is... special. To get the C version, we need to install Cython and libyaml, then
# build it locally -- just using pip won't work.
Expand Down
2 changes: 1 addition & 1 deletion docker/test-http/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The `test-http` image gets built by `pkg/kubeapply` for use by
# various kubeapply-templated YAML files.

FROM golang:1.21
FROM golang:1.22
COPY httptest.go /usr/local/bin/httptest.go
RUN go build -o /usr/local/bin/httptest /usr/local/bin/httptest.go
ENTRYPOINT ["/usr/local/bin/httptest"]
49 changes: 25 additions & 24 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/emissary-ingress/emissary/v3

go 1.21
go 1.22.4

// If you're editing this file, there's a few things you should know:
//
Expand Down Expand Up @@ -89,7 +89,7 @@ require (
github.com/datawire/go-mkopensource v0.0.12-0.20230821212923-d1d8451579a1
github.com/envoyproxy/protoc-gen-validate v1.0.2
github.com/fsnotify/fsnotify v1.7.0
github.com/go-logr/zapr v1.2.4
github.com/go-logr/zapr v1.3.0
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.5.0
github.com/gorilla/websocket v1.5.1
Expand All @@ -105,28 +105,28 @@ require (
github.com/spf13/viper v1.7.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/proto/otlp v1.0.0
go.uber.org/goleak v1.2.1
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.26.0
golang.org/x/mod v0.14.0
golang.org/x/sync v0.5.0
golang.org/x/mod v0.15.0
golang.org/x/sync v0.6.0
golang.org/x/sys v0.18.0
google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917
google.golang.org/grpc v1.60.1
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
google.golang.org/protobuf v1.33.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.28.5
k8s.io/apiextensions-apiserver v0.28.5
k8s.io/apimachinery v0.28.5
k8s.io/cli-runtime v0.28.5
k8s.io/client-go v0.28.5
k8s.io/code-generator v0.28.5
k8s.io/klog/v2 v2.110.1
k8s.io/kubectl v0.28.5
k8s.io/kubernetes v1.28.5
k8s.io/metrics v0.28.5
sigs.k8s.io/controller-runtime v0.16.3
k8s.io/api v0.30.1
k8s.io/apiextensions-apiserver v0.30.1
k8s.io/apimachinery v0.30.1
k8s.io/cli-runtime v0.30.1
k8s.io/client-go v0.30.1
k8s.io/code-generator v0.30.1
k8s.io/klog/v2 v2.120.1
k8s.io/kubectl v0.30.1
k8s.io/kubernetes v1.30.1
k8s.io/metrics v0.30.1
sigs.k8s.io/controller-runtime v0.18.2
sigs.k8s.io/controller-tools v0.13.0
sigs.k8s.io/e2e-framework v0.3.0
sigs.k8s.io/gateway-api v0.2.0
Expand All @@ -151,26 +151,26 @@ require (
github.com/cloudflare/circl v1.3.7 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/go-errors/errors v1.5.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gobuffalo/flect v1.0.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/cel-go v0.18.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
Expand Down Expand Up @@ -210,6 +210,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pelletier/go-toml v1.2.0 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
Expand Down Expand Up @@ -237,18 +238,18 @@ require (
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.16.1 // indirect
golang.org/x/tools v0.18.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.51.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.28.5 // indirect
k8s.io/component-base v0.28.5 // indirect
k8s.io/apiserver v0.30.1 // indirect
k8s.io/component-base v0.30.1 // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
Expand Down
Loading

0 comments on commit 1c96a9d

Please sign in to comment.