Skip to content

Commit

Permalink
Update Envoy gateway code from v1.1.2 to v1.2.6 (#3731)
Browse files Browse the repository at this point in the history
* Update Envoy gateway code from v1.1.2 to v1.2.6

This is to address CVE-2025-24030
GHSA-j777-63hf-hx76

As part of this:

- I added a handy 'mod-tidy' target in the Makefile.

- Various updates needed for version bumps in some of the k8s libraries that we
pull in.

* Update NewIndexerInformer to NewInformerWithOptions

* FV: Skip controller name validation

Moving from controller-runtime v0.18.5 to v0.19.1, by default there is [a new
global
variable](https://github.com/kubernetes-sigs/controller-runtime/blob/v0.19.1/pkg/controller/name.go#L27)
checking against reuse of controller names.  That scuppers our FV tests because
they all run in a single process execution.  But there's a SkipNameValidation
option that we can use to disable that checking.
  • Loading branch information
nelljerram authored Feb 4, 2025
1 parent aca5c78 commit 85272a6
Show file tree
Hide file tree
Showing 27 changed files with 9,787 additions and 5,880 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ else
endif

ENVOY_GATEWAY_HELM_CHART ?= oci://docker.io/envoyproxy/gateway-helm
ENVOY_GATEWAY_VERSION ?= v1.1.2
ENVOY_GATEWAY_VERSION ?= v1.2.6
ENVOY_GATEWAY_PREFIX ?= tigera-gateway-api
ENVOY_GATEWAY_NAMESPACE ?= tigera-gateway
ENVOY_GATEWAY_RESOURCES = pkg/render/gateway_api_resources.yaml
Expand Down Expand Up @@ -834,6 +834,9 @@ vet:
sh -c '$(GIT_CONFIG_SSH) \
go vet ./...'

mod-tidy:
$(DOCKER_RUN) sh -c 'go mod tidy'

# Generate code
# We use the upstream latest release of controller-gen as this is compatible with golang 1.19+ and we have no need
# for custom projectcalico.org types.
Expand Down
38 changes: 21 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module github.com/tigera/operator

go 1.23
go 1.23.1

toolchain go1.23.2
toolchain go1.23.5

require (
github.com/aws/aws-sdk-go v1.55.5
github.com/cloudflare/cfssl v1.6.5
github.com/containernetworking/cni v1.2.3
github.com/corazawaf/coraza-coreruleset v0.0.0-20240226094324-415b1017abdc
github.com/elastic/cloud-on-k8s/v2 v2.14.0
github.com/envoyproxy/gateway v1.1.2
github.com/envoyproxy/gateway v1.2.6
github.com/go-ldap/ldap v3.0.3+incompatible
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
Expand All @@ -35,14 +35,14 @@ require (
gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.30.5
k8s.io/apiextensions-apiserver v0.30.5
k8s.io/apimachinery v0.30.5
k8s.io/apiserver v0.30.5
k8s.io/client-go v0.30.5
k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery v0.31.2
k8s.io/apiserver v0.31.2
k8s.io/client-go v0.31.2
k8s.io/kube-aggregator v0.30.5
sigs.k8s.io/controller-runtime v0.18.5
sigs.k8s.io/gateway-api v1.1.0
sigs.k8s.io/controller-runtime v0.19.1
sigs.k8s.io/gateway-api v1.2.1
sigs.k8s.io/kind v0.24.0 // Do not remove, not used by code but used by build
sigs.k8s.io/yaml v1.4.0
)
Expand All @@ -61,7 +61,8 @@ require (
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
Expand All @@ -84,6 +85,7 @@ require (
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/magefile/mage v1.14.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
Expand All @@ -93,34 +95,36 @@ require (
github.com/nxadm/tail v1.4.8 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/x448/float16 v0.8.4 // indirect
go.elastic.co/apm/module/apmzap/v2 v2.6.0 // indirect
go.elastic.co/apm/v2 v2.6.0 // indirect
go.elastic.co/fastjson v1.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.24.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.34.2 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
howett.net/plist v1.0.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Expand Down
Loading

0 comments on commit 85272a6

Please sign in to comment.