From 43a1a089726eb29863f81c28e97543a8ffe5d4cf Mon Sep 17 00:00:00 2001 From: Nell Jerram Date: Thu, 11 Dec 2025 10:12:24 +0000 Subject: [PATCH] Bump Envoy Gateway to v1.5.6 --- Makefile | 2 +- docs/common_tasks.md | 2 +- go.mod | 6 +- go.sum | 12 +- .../gatewayapi/gateway_api_resources.yaml | 133 ++++++++---------- 5 files changed, 67 insertions(+), 88 deletions(-) diff --git a/Makefile b/Makefile index a40b92ef98..8934b37192 100644 --- a/Makefile +++ b/Makefile @@ -247,7 +247,7 @@ $(ISTIO_RESOURCES_DIR)/%.tgz: # To update the Envoy Gateway version, see "Updating the bundled version of # Envoy Gateway" in docs/common_tasks.md. ENVOY_GATEWAY_HELM_CHART ?= oci://docker.io/envoyproxy/gateway-helm -ENVOY_GATEWAY_VERSION ?= v1.5.0 +ENVOY_GATEWAY_VERSION ?= v1.5.6 ENVOY_GATEWAY_PREFIX ?= tigera-gateway-api ENVOY_GATEWAY_NAMESPACE ?= tigera-gateway ENVOY_GATEWAY_RESOURCES = pkg/render/gatewayapi/gateway_api_resources.yaml diff --git a/docs/common_tasks.md b/docs/common_tasks.md index a0b1eacab1..d529bed288 100644 --- a/docs/common_tasks.md +++ b/docs/common_tasks.md @@ -182,7 +182,7 @@ spec: 1. In `Makefile`, update `ENVOY_GATEWAY_VERSION`. -1. Delete `pkg/render/gateway_api_resources.yaml`. +1. Delete `pkg/render/gatewayapi/gateway_api_resources.yaml`. 1. Run `make build`. This will generate a new version of `pkg/render/gateway_api_resources.yaml` and then build the operator image. diff --git a/go.mod b/go.mod index 212c94810b..66b95f37da 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/containernetworking/cni v1.2.3 github.com/corazawaf/coraza-coreruleset/v4 v4.7.0 github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250129010100-648f902d9807 - github.com/envoyproxy/gateway v1.5.0 + github.com/envoyproxy/gateway v1.5.6 github.com/go-ldap/ldap v3.0.3+incompatible github.com/go-logr/logr v1.4.3 github.com/google/go-cmp v0.7.0 @@ -173,8 +173,8 @@ require ( gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect - google.golang.org/grpc v1.74.2 // indirect - google.golang.org/protobuf v1.36.6 // indirect + google.golang.org/grpc v1.75.1 // indirect + google.golang.org/protobuf v1.36.10 // indirect gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect diff --git a/go.sum b/go.sum index 6adc78c76f..d010e1342f 100644 --- a/go.sum +++ b/go.sum @@ -109,8 +109,8 @@ github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUt github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss= github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU= github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/envoyproxy/gateway v1.5.0 h1:wfHytSeNoinwu0vCtWT61XK23qJuRmJyU+CPWdIJp2I= -github.com/envoyproxy/gateway v1.5.0/go.mod h1:jgU4J61wGBqPWzTW14otfLXoSU82qo75xz6CUVLILVc= +github.com/envoyproxy/gateway v1.5.6 h1:png7xvwXn5ev6Vpf4PrUl52XxLsa8MICs7123VixQ3M= +github.com/envoyproxy/gateway v1.5.6/go.mod h1:vyXwIl/iz4WNDOcwqwr0Z0QaIoVdnTQ+lTdtJ7JxYvs= github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8= github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU= @@ -560,16 +560,16 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 h1: google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0/go.mod h1:8ytArBbtOy2xfht+y2fqKd5DRDJRUQhqbyEnQ4bDChs= google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 h1:MAKi5q709QWfnkkpNQ0M12hYJ1+e8qYVDyowc4U1XZM= google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= -google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4= -google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM= +google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI= +google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= -google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= +google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/render/gatewayapi/gateway_api_resources.yaml b/pkg/render/gatewayapi/gateway_api_resources.yaml index e9168c1055..8837f9d39a 100644 --- a/pkg/render/gatewayapi/gateway_api_resources.yaml +++ b/pkg/render/gatewayapi/gateway_api_resources.yaml @@ -17980,8 +17980,7 @@ spec: Defaults to 200 only items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -19336,8 +19335,7 @@ spec: The retriable-status-codes trigger must also be configured for these status codes to trigger a retry. items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -21885,8 +21883,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -22396,8 +22393,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -24572,7 +24568,7 @@ spec: x-kubernetes-validations: - message: Image must include a tag and allowed characters only (e.g., 'repo:tag'). - rule: self.matches('^[a-zA-Z0-9._/-]+(:[a-zA-Z0-9._-]+)?(@sha256:[a-z0-9]+)?$') + rule: self.matches('^[a-zA-Z0-9._-]+(:[0-9]+)?(/[a-zA-Z0-9._/-]+)?(:[a-zA-Z0-9._-]+)?(@sha256:[a-z0-9]+)?$') imageRepository: description: |- ImageRepository specifies the container image repository to be used without specifying a tag. @@ -28417,7 +28413,7 @@ spec: x-kubernetes-validations: - message: Image must include a tag and allowed characters only (e.g., 'repo:tag'). - rule: self.matches('^[a-zA-Z0-9._/-]+(:[a-zA-Z0-9._-]+)?(@sha256:[a-z0-9]+)?$') + rule: self.matches('^[a-zA-Z0-9._-]+(:[0-9]+)?(/[a-zA-Z0-9._/-]+)?(:[a-zA-Z0-9._-]+)?(@sha256:[a-z0-9]+)?$') imageRepository: description: |- ImageRepository specifies the container image repository to be used without specifying a tag. @@ -34935,8 +34931,7 @@ spec: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -35495,8 +35490,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -36048,8 +36042,7 @@ spec: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -36608,8 +36601,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -37265,8 +37257,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -37800,8 +37791,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -38382,8 +38372,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -38913,8 +38902,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -40346,8 +40334,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -40866,8 +40853,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -41355,8 +41341,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -41875,8 +41860,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -42559,8 +42543,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -43092,8 +43075,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -43333,7 +43315,6 @@ spec: By default, its unset. properties: sameSite: - default: Strict enum: - Lax - Strict @@ -43823,8 +43804,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -44343,8 +44323,7 @@ spec: items: description: HTTPStatus defines the http status code. - exclusiveMaximum: true - maximum: 600 + maximum: 599 minimum: 100 type: integer type: array @@ -45006,10 +44985,10 @@ metadata: name: envoy-gateway namespace: 'tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm --- # Source: gateway-helm/templates/envoy-gateway-config.yaml @@ -45019,10 +44998,10 @@ metadata: name: envoy-gateway-config namespace: 'tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm data: envoy-gateway.yaml: | @@ -45038,7 +45017,7 @@ data: kubernetes: rateLimitDeployment: container: - image: docker.io/envoyproxy/ratelimit:3e085e5b + image: docker.io/envoyproxy/ratelimit:e74a664a patch: type: StrategicMerge value: @@ -45049,7 +45028,7 @@ data: - imagePullPolicy: IfNotPresent name: envoy-ratelimit shutdownManager: - image: docker.io/envoyproxy/gateway:v1.5.0 + image: docker.io/envoyproxy/gateway:v1.5.6 type: Kubernetes --- # Source: gateway-helm/templates/envoy-gateway-rbac.yaml @@ -45205,10 +45184,10 @@ metadata: name: tigera-gateway-api-gateway-helm-infra-manager namespace: 'tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm rules: - apiGroups: @@ -45264,10 +45243,10 @@ metadata: name: tigera-gateway-api-gateway-helm-leader-election-role namespace: 'tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm rules: - apiGroups: @@ -45309,10 +45288,10 @@ metadata: name: tigera-gateway-api-gateway-helm-infra-manager namespace: 'tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io @@ -45330,10 +45309,10 @@ metadata: name: tigera-gateway-api-gateway-helm-leader-election-rolebinding namespace: 'tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io @@ -45352,10 +45331,10 @@ metadata: namespace: 'tigera-gateway' labels: control-plane: envoy-gateway - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm spec: selector: @@ -45387,10 +45366,10 @@ metadata: namespace: 'tigera-gateway' labels: control-plane: envoy-gateway - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -45421,7 +45400,7 @@ spec: fieldPath: metadata.namespace - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local - image: docker.io/envoyproxy/gateway:v1.5.0 + image: docker.io/envoyproxy/gateway:v1.5.6 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -45490,10 +45469,10 @@ metadata: name: tigera-gateway-api-gateway-helm-certgen namespace: 'tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": pre-install, pre-upgrade @@ -45505,10 +45484,10 @@ kind: ClusterRole metadata: name: 'tigera-gateway-api-gateway-helm-certgen:tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": pre-install, pre-upgrade @@ -45538,10 +45517,10 @@ kind: ClusterRoleBinding metadata: name: 'tigera-gateway-api-gateway-helm-certgen:tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": pre-install, pre-upgrade @@ -45562,10 +45541,10 @@ metadata: name: tigera-gateway-api-gateway-helm-certgen namespace: 'tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": pre-install, pre-upgrade @@ -45587,10 +45566,10 @@ metadata: name: tigera-gateway-api-gateway-helm-certgen namespace: 'tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": pre-install, pre-upgrade @@ -45611,10 +45590,10 @@ metadata: name: tigera-gateway-api-gateway-helm-certgen namespace: 'tigera-gateway' labels: - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": pre-install, pre-upgrade @@ -45639,7 +45618,7 @@ spec: fieldPath: metadata.namespace - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local - image: docker.io/envoyproxy/gateway:v1.5.0 + image: docker.io/envoyproxy/gateway:v1.5.6 imagePullPolicy: IfNotPresent name: envoy-gateway-certgen securityContext: @@ -45669,10 +45648,10 @@ metadata: "helm.sh/hook-weight": "-1" labels: app.kubernetes.io/component: topology-injector - helm.sh/chart: gateway-helm-v1.5.0 + helm.sh/chart: gateway-helm-v1.5.6 app.kubernetes.io/name: gateway-helm app.kubernetes.io/instance: tigera-gateway-api - app.kubernetes.io/version: "v1.5.0" + app.kubernetes.io/version: "v1.5.6" app.kubernetes.io/managed-by: Helm webhooks: - name: topology.webhook.gateway.envoyproxy.io