Merge branch 'main' into dependabot/docker/tools/docker/envoy-gateway…

…/busybox-db142d433cdde11f10ae479dbf92f3b13d693fd1c91053da9979728cceb1dc68
envoyproxy · Nov 28, 2024 · c3441ba · c3441ba
2 parents 19d8bcf + 17e932c
commit c3441ba
Show file tree

Hide file tree

Showing 219 changed files with 1,599 additions and 224 deletions.
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -55,7 +55,7 @@ jobs:
     - name: Run Coverage Tests
       run: make go.test.coverage
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a  # v5.0.2
+      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238  # v4.6.0
       with:
         fail_ci_if_error: true
         files: ./coverage.xml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -36,14 +36,14 @@ jobs:
     - uses: ./tools/github-actions/setup-deps
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f  # v3.27.4
+      uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88  # v3.27.5
       with:
         languages: ${{ matrix.language }}
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f  # v3.27.4
+      uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88  # v3.27.5
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f  # v3.27.4
+      uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88  # v3.27.5
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -40,6 +40,6 @@ jobs:
         retention-days: 5
 
     - name: "Upload to code-scanning"
-      uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f  # v3.27.4
+      uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88  # v3.27.5
       with:
         sarif_file: results.sarif
diff --git a/ADOPTERS.md b/ADOPTERS.md
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v1.2.1
+v1.2.2
diff --git a/api/v1alpha1/ext_proc_types.go b/api/v1alpha1/ext_proc_types.go
@@ -22,11 +22,21 @@ const (
 )
 
 // ProcessingModeOptions defines if headers or body should be processed by the external service
+// and which attributes are sent to the processor
 type ProcessingModeOptions struct {
 	// Defines body processing mode
 	//
 	// +optional
 	Body *ExtProcBodyProcessingMode `json:"body,omitempty"`
+
+	// Defines which attributes are sent to the external processor. Envoy Gateway currently
+	// supports only the following attribute prefixes: connection, source, destination,
+	// request, response, upstream and xds.route.
+	// https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/attributes
+	//
+	// +optional
+	// +kubebuilder:validation:items:Pattern=`^(connection\.|source\.|destination\.|request\.|response\.|upstream\.|xds\.route_)[a-z_1-9]*$`
+	Attributes []string `json:"attributes,omitempty"`
 }
 
 // ExtProcProcessingMode defines if and how headers and bodies are sent to the service.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml
@@ -918,6 +918,16 @@ spec:
                             Defines processing mode for requests. If present, request headers are sent. Request body is processed according
                             to the specified mode.
                           properties:
+                            attributes:
+                              description: |-
+                                Defines which attributes are sent to the external processor. Envoy Gateway currently
+                                supports only the following attribute prefixes: connection, source, destination,
+                                request, response, upstream and xds.route.
+                                https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/attributes
+                              items:
+                                pattern: ^(connection\.|source\.|destination\.|request\.|response\.|upstream\.|xds\.route_)[a-z_1-9]*$
+                                type: string
+                              type: array
                             body:
                               description: Defines body processing mode
                               enum:
@@ -931,6 +941,16 @@ spec:
                             Defines processing mode for responses. If present, response headers are sent. Response body is processed according
                             to the specified mode.
                           properties:
+                            attributes:
+                              description: |-
+                                Defines which attributes are sent to the external processor. Envoy Gateway currently
+                                supports only the following attribute prefixes: connection, source, destination,
+                                request, response, upstream and xds.route.
+                                https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/attributes
+                              items:
+                                pattern: ^(connection\.|source\.|destination\.|request\.|response\.|upstream\.|xds\.route_)[a-z_1-9]*$
+                                type: string
+                              type: array
                             body:
                               description: Defines body processing mode
                               enum:

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
 require (
 	fortio.org/fortio v1.68.0
 	fortio.org/log v1.17.1
-	github.com/Masterminds/semver/v3 v3.3.0
+	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/docker/cli v27.3.1+incompatible
@@ -21,7 +21,7 @@ require (
 	github.com/go-logr/zapr v1.3.0
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4
-	github.com/google/cel-go v0.22.0
+	github.com/google/cel-go v0.22.1
 	github.com/google/go-cmp v0.6.0
 	github.com/google/go-containerregistry v0.20.2
 	github.com/hashicorp/go-multierror v1.1.1

diff --git a/go.sum b/go.sum
@@ -62,8 +62,8 @@ github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
-github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
-github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
+github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
 github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
 github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=
@@ -386,8 +386,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/cel-go v0.22.0 h1:b3FJZxpiv1vTMo2/5RDUqAHPxkT8mmMfJIrq1llbf7g=
-github.com/google/cel-go v0.22.0/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8=
+github.com/google/cel-go v0.22.1 h1:AfVXx3chM2qwoSbM7Da8g8hX8OVSkBFwX+rz2+PcK40=
+github.com/google/cel-go v0.22.1/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8=
 github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
 github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=

diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -40,12 +40,13 @@ envoyProxyForGatewayClass:
             resource_api_version: V3
         static_resources:
           listeners:
-          - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+          - name: envoy-gateway-proxy-ready-::-19001
             address:
               socket_address:
-                address: 0.0.0.0
+                address: '::'
                 port_value: 19001
                 protocol: TCP
+                ipv4_compat: true
             filter_chains:
             - filters:
               - name: envoy.filters.network.http_connection_manager
@@ -658,7 +659,8 @@ xds:
           listeners:
           - address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 19001
             filterChains:
             - filters:
@@ -689,7 +691,7 @@ xds:
                         route:
                           cluster: prometheus_stats
                   statPrefix: eg-ready-http
-            name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            name: envoy-gateway-proxy-ready-::-19001
     - '@type': type.googleapis.com/envoy.admin.v3.EndpointsConfigDump
       dynamicEndpointConfigs:
       - endpointConfig:
@@ -772,6 +774,7 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
+          dnsLookupFamily: V4_PREFERRED
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -791,6 +794,7 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
+          dnsLookupFamily: V4_PREFERRED
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -817,6 +821,7 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
+          dnsLookupFamily: V4_PREFERRED
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -836,6 +841,7 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
+          dnsLookupFamily: V4_PREFERRED
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -855,6 +861,7 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
+          dnsLookupFamily: V4_PREFERRED
           edsClusterConfig:
             edsConfig:
               ads: {}

diff --git a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml
@@ -100,6 +100,7 @@ xds:
         commonLbConfig:
           localityWeightedLbConfig: {}
         connectTimeout: 10s
+        dnsLookupFamily: V4_PREFERRED
         edsClusterConfig:
           edsConfig:
             ads: {}

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
@@ -234,7 +234,8 @@
                 {
                   "address": {
                     "socketAddress": {
-                      "address": "0.0.0.0",
+                      "address": "::",
+                      "ipv4Compat": true,
                       "portValue": 19001
                     }
                   },
@@ -295,7 +296,7 @@
                       ]
                     }
                   ],
-                  "name": "envoy-gateway-proxy-ready-0.0.0.0-19001"
+                  "name": "envoy-gateway-proxy-ready-::-19001"
                 }
               ]
             }
@@ -458,6 +459,7 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
+                "dnsLookupFamily": "V4_PREFERRED",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},
@@ -487,6 +489,7 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
+                "dnsLookupFamily": "V4_PREFERRED",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},
@@ -527,6 +530,7 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
+                "dnsLookupFamily": "V4_PREFERRED",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},
@@ -556,6 +560,7 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
+                "dnsLookupFamily": "V4_PREFERRED",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},
@@ -585,6 +590,7 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
+                "dnsLookupFamily": "V4_PREFERRED",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},