Move size type; remove duplicates strings; regen crds

Author: ciarams87

apis/v1alpha1/clientsettingspolicy_types.go

@@ -121,10 +121,3 @@ type ClientKeepAliveTimeout struct {
 	// +optional
 	Header *Duration `json:"header,omitempty"`
 }
-
-// Size is a string value representing a size. Size can be specified in bytes, kilobytes (k), megabytes (m),
-// or gigabytes (g).
-// Examples: 1024, 8k, 1m.
-//
-// +kubebuilder:validation:Pattern=`^\d{1,4}(k|m|g)?$`
-type Size string

apis/v1alpha1/proxysettingspolicy_types.go

@@ -66,23 +66,20 @@ type ProxyBuffering struct {
 
 	// BufferSize sets the size of the buffer used for reading the first part of the response received from
 	// the proxied server. This part usually contains a small response header.
-	// Default: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffer_size
 	// Directive: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffer_size
 	//
 	// +optional
 	BufferSize *Size `json:"bufferSize,omitempty"`
 
 	// Buffers sets the number and size of buffers used for reading a response from the proxied server,
 	// for a single connection.
-	// Default: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffers
 	// Directive: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffers
 	//
 	// +optional
 	Buffers *ProxyBuffers `json:"buffers,omitempty"`
 
 	// BusyBuffersSize sets the total size of buffers that can be busy sending a response to the client,
 	// while the response is not yet fully read.
-	// Default: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_busy_buffers_size
 	// Directive: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_busy_buffers_size
 	//
 	// +optional

apis/v1alpha1/shared_types.go

@@ -26,3 +26,10 @@ type SpanAttribute struct {
 	// +kubebuilder:validation:Pattern=`^([^"$\\]|\\[^$])*$`
 	Value string `json:"value"`
 }
+
+// Size is a string value representing a size. Size can be specified in bytes, kilobytes (k), megabytes (m),
+// or gigabytes (g).
+// Examples: 1024, 8k, 1m.
+//
+// +kubebuilder:validation:Pattern=`^\d{1,4}(k|m|g)?$`
+type Size string

config/crd/bases/gateway.nginx.org_proxysettingspolicies.yaml

@@ -59,20 +59,19 @@ spec:
                     description: |-
                       BufferSize sets the size of the buffer used for reading the first part of the response received from
                       the proxied server. This part usually contains a small response header.
-                      Default: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffer_size
                       Directive: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffer_size
                     pattern: ^\d{1,4}(k|m|g)?$
                     type: string
                   buffers:
                     description: |-
                       Buffers sets the number and size of buffers used for reading a response from the proxied server,
                       for a single connection.
-                      Default: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffers
                       Directive: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffers
                     properties:
                       number:
                         description: Number sets the number of buffers.
                         format: int32
+                        maximum: 256
                         minimum: 2
                         type: integer
                       size:
@@ -87,7 +86,6 @@ spec:
                     description: |-
                       BusyBuffersSize sets the total size of buffers that can be busy sending a response to the client,
                       while the response is not yet fully read.
-                      Default: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_busy_buffers_size
                       Directive: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_busy_buffers_size
                     pattern: ^\d{1,4}(k|m|g)?$
                     type: string
@@ -135,6 +133,16 @@ spec:
                 maxItems: 16
                 minItems: 1
                 type: array
+                x-kubernetes-validations:
+                - message: TargetRefs entries must have kind Gateway, HTTPRoute, or
+                    GRPCRoute
+                  rule: self.all(t, t.kind == 'Gateway' || t.kind == 'HTTPRoute' ||
+                    t.kind == 'GRPCRoute')
+                - message: TargetRefs entries must have group gateway.networking.k8s.io
+                  rule: self.all(t, t.group == 'gateway.networking.k8s.io')
+                - message: TargetRefs must be unique
+                  rule: self.all(t1, self.exists_one(t2, t1.group == t2.group && t1.kind
+                    == t2.kind && t1.name == t2.name))
             required:
             - targetRefs
             type: object

deploy/crds.yaml

@@ -9397,20 +9397,19 @@ spec:
                     description: |-
                       BufferSize sets the size of the buffer used for reading the first part of the response received from
                       the proxied server. This part usually contains a small response header.
-                      Default: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffer_size
                       Directive: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffer_size
                     pattern: ^\d{1,4}(k|m|g)?$
                     type: string
                   buffers:
                     description: |-
                       Buffers sets the number and size of buffers used for reading a response from the proxied server,
                       for a single connection.
-                      Default: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffers
                       Directive: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffers
                     properties:
                       number:
                         description: Number sets the number of buffers.
                         format: int32
+                        maximum: 256
                         minimum: 2
                         type: integer
                       size:
@@ -9425,7 +9424,6 @@ spec:
                     description: |-
                       BusyBuffersSize sets the total size of buffers that can be busy sending a response to the client,
                       while the response is not yet fully read.
-                      Default: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_busy_buffers_size
                       Directive: https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_busy_buffers_size
                     pattern: ^\d{1,4}(k|m|g)?$
                     type: string
@@ -9473,6 +9471,16 @@ spec:
                 maxItems: 16
                 minItems: 1
                 type: array
+                x-kubernetes-validations:
+                - message: TargetRefs entries must have kind Gateway, HTTPRoute, or
+                    GRPCRoute
+                  rule: self.all(t, t.kind == 'Gateway' || t.kind == 'HTTPRoute' ||
+                    t.kind == 'GRPCRoute')
+                - message: TargetRefs entries must have group gateway.networking.k8s.io
+                  rule: self.all(t, t.group == 'gateway.networking.k8s.io')
+                - message: TargetRefs must be unique
+                  rule: self.all(t1, self.exists_one(t2, t1.group == t2.group && t1.kind
+                    == t2.kind && t1.name == t2.name))
             required:
             - targetRefs
             type: object