fix metadata options

Signed-off-by: Guy Daich <[email protected]>
envoyproxy · Apr 3, 2024 · d1660ee · d1660ee
1 parent 455b9f2
commit d1660ee
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 44 deletions.
diff --git a/api/v1alpha1/ext_proc_types.go b/api/v1alpha1/ext_proc_types.go
@@ -83,12 +83,12 @@ type ExtProcMetadataOptions struct {
 	// metadata namespaces forwarded to external processor
 	//
 	// +optional
-	ForwardingNamespaces []MetadataNamespaces `json:"forwardingNamespaces,omitempty"`
+	ForwardingNamespaces MetadataNamespaces `json:"forwardingNamespaces,omitempty"`
 
 	// metadata namespaces updatable by external processor
 	//
 	// +optional
-	ReceivingNamespaces []MetadataNamespaces `json:"receivingNamespaces,omitempty"`
+	ReceivingNamespaces MetadataNamespaces `json:"receivingNamespaces,omitempty"`
 }
 
 // +kubebuilder:validation:XValidation:rule="has(self.backendRef) ? (!has(self.backendRef.group) || self.backendRef.group == \"\") : true", message="group is invalid, only the core API group (specified by omitting the group field or setting it to an empty string) is supported"

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
@@ -169,34 +169,26 @@ spec:
                       properties:
                         forwardingNamespaces:
                           description: metadata namespaces forwarded to external processor
-                          items:
-                            description: MetadataNamespaces defines metadata namespaces
-                              that can be used to forward or receive dynamic metadata
-                            properties:
-                              untyped:
-                                description: |-
-                                  Specifies a list of metadata namespaces whose values, if present, will be passed to the ext_proc service
-                                  as an opaque protobuf::Struct.
-                                items:
-                                  type: string
-                                type: array
-                            type: object
-                          type: array
+                          properties:
+                            untyped:
+                              description: |-
+                                Specifies a list of metadata namespaces whose values, if present, will be passed to the ext_proc service
+                                as an opaque protobuf::Struct.
+                              items:
+                                type: string
+                              type: array
+                          type: object
                         receivingNamespaces:
                           description: metadata namespaces updatable by external processor
-                          items:
-                            description: MetadataNamespaces defines metadata namespaces
-                              that can be used to forward or receive dynamic metadata
-                            properties:
-                              untyped:
-                                description: |-
-                                  Specifies a list of metadata namespaces whose values, if present, will be passed to the ext_proc service
-                                  as an opaque protobuf::Struct.
-                                items:
-                                  type: string
-                                type: array
-                            type: object
-                          type: array
+                          properties:
+                            untyped:
+                              description: |-
+                                Specifies a list of metadata namespaces whose values, if present, will be passed to the ext_proc service
+                                as an opaque protobuf::Struct.
+                              items:
+                                type: string
+                              type: array
+                          type: object
                       type: object
                     processingMode:
                       description: |-

diff --git a/site/content/en/latest/api/extension_types.md b/site/content/en/latest/api/extension_types.md
@@ -1094,8 +1094,8 @@ _Appears in:_
 
 | Field | Type | Required | Description |
 | ---   | ---  | ---      | ---         |
-| `forwardingNamespaces` | _[MetadataNamespaces](#metadatanamespaces) array_ |  false  | metadata namespaces forwarded to external processor |
-| `receivingNamespaces` | _[MetadataNamespaces](#metadatanamespaces) array_ |  false  | metadata namespaces updatable by external processor |
+| `forwardingNamespaces` | _[MetadataNamespaces](#metadatanamespaces)_ |  false  | metadata namespaces forwarded to external processor |
+| `receivingNamespaces` | _[MetadataNamespaces](#metadatanamespaces)_ |  false  | metadata namespaces updatable by external processor |
 
 
 #### ExtProcProcessingMode