BUILD/MEDIUM: deps: update client-native to v6.2.18

The Equal and Diff methods of the client-native models are now generated by
go-method-gen and take GoMethodGenOptions instead of the removed
models.Options; the Equalizer plumbing in utils, store and the v3 TCP CR
followed.

The generated Diff no longer treats nil as equal to an empty struct pointer.
Empty TuneOptions/TuneSslOptions injected by the controller are not
persisted in the config file, so they kept re-appearing as a diff and caused
a reload on every sync; both sides are now normalized to nil when empty
before diffing.

The regenerated v3 CRDs only gain new fields, nothing is removed.

Author: oktalz

crs/api/ingress/v3/backend.go

@@ -22,7 +22,7 @@ import (
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:metadata:annotations="haproxy.org/client-native=v6.2.4"
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v6.2.18"
 
 // Backend is a specification for a Backend resource
 type Backend struct {

crs/api/ingress/v3/defaults.go

@@ -22,7 +22,7 @@ import (
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:metadata:annotations="haproxy.org/client-native=v6.2.4"
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v6.2.18"
 
 // Defaults is a specification for a Defaults resource
 type Defaults struct {

crs/api/ingress/v3/frontend.go

@@ -22,7 +22,7 @@ import (
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:metadata:annotations="haproxy.org/client-native=v6.2.4"
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v6.2.18"
 
 // Frontend is a specification for a Frontend resource
 type Frontend struct {

crs/api/ingress/v3/global.go

@@ -22,7 +22,7 @@ import (
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:metadata:annotations="haproxy.org/client-native=v6.2.4"
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v6.2.18"
 // +kubebuilder:validation:XValidation:rule="!has(self.spec.default_path)", message="spec.config.default_path is set by ingress controller internally"
 // +kubebuilder:validation:XValidation:rule="!has(self.spec.master__dash__worker)", message="spec.config.master-worker is set by ingress controller internally"
 // +kubebuilder:validation:XValidation:rule="!has(self.spec.pidfile)", message="spec.config.pidfile is set by ingress controller internally"

crs/api/ingress/v3/tcp.go

@@ -18,12 +18,13 @@ package v3
 import (
 	"github.com/go-openapi/swag/jsonutils"
 	"github.com/haproxytech/client-native/v6/models"
+	"github.com/haproxytech/go-method-gen/pkg/eqdiff"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:metadata:annotations="haproxy.org/client-native=v6.2.4"
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v6.2.18"
 
 // TCP is a specification for a TCP resource
 type TCP struct {
@@ -100,7 +101,7 @@ func (s *TCPService) UnmarshalBinary(b []byte) error {
 	return nil
 }
 
-func (a TCPModel) Equal(b TCPModel, opt ...models.Options) bool {
+func (a TCPModel) Equal(b TCPModel, opt ...eqdiff.GoMethodGenOptions) bool {
 	if a.Name != b.Name {
 		return false
 	}
@@ -134,6 +135,6 @@ func (a TCPModel) Equal(b TCPModel, opt ...models.Options) bool {
 	return true
 }
 
-func (s TCPService) Equal(b TCPService, opt ...models.Options) bool {
+func (s TCPService) Equal(b TCPService, opt ...eqdiff.GoMethodGenOptions) bool {
 	return s.Name == b.Name && s.Port == b.Port
 }

crs/definition/ingress.v3.haproxy.org_backends.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    haproxy.org/client-native: v6.2.4
+    haproxy.org/client-native: v6.2.18
   name: backends.ingress.v3.haproxy.org
 spec:
   group: ingress.v3.haproxy.org
@@ -1300,6 +1300,17 @@ spec:
                           It follows the HAProxy size format and is expressed in bytes.
                         format: int64
                         type: integer
+                      lua_args:
+                        description: Optional arguments passed to the Lua filter constructor.
+                        items:
+                          type: string
+                        type: array
+                      lua_name:
+                        description: |-
+                          Name of the Lua filter as registered by core.register_filter(), used in the 'filter lua.<name>' directive.
+                          Pattern: ^[^\s]+$
+                        pattern: ^[^\s]+$
+                        type: string
                       metadata:
                         x-kubernetes-preserve-unknown-fields: true
                       min_size:
@@ -1345,7 +1356,7 @@ spec:
                         description: |-
                           type
                           Required: true
-                          Enum: ["bwlim-in","bwlim-out","cache","compression","fcgi-app","spoe","trace"]
+                          Enum: ["bwlim-in","bwlim-out","cache","compression","fcgi-app","spoe","trace","lua"]
                         enum:
                           - bwlim-in
                           - bwlim-out
@@ -1354,6 +1365,7 @@ spec:
                           - fcgi-app
                           - spoe
                           - trace
+                          - lua
                         type: string
                     required:
                       - type
@@ -1407,6 +1419,54 @@ spec:
                       - cond_test
                     type: object
                   type: array
+                forwarded:
+                  description: forwarded
+                  properties:
+                    by:
+                      description: Adds the by parameter using the local address.
+                      type: boolean
+                    by_expr:
+                      description: Adds the by parameter using the specified log-format expression.
+                      type: string
+                    by_port:
+                      description: Adds the by parameter port using the local port.
+                      type: boolean
+                    by_port_expr:
+                      description: Adds the by parameter port using the specified log-format expression.
+                      type: string
+                    enabled:
+                      description: |-
+                        Enables or disables insertion of the HTTP Forwarded header field.
+                        Required: true
+                        Enum: ["enabled","disabled"]
+                      enum:
+                        - enabled
+                        - disabled
+                      type: string
+                    for:
+                      description: Adds the for parameter using the client address.
+                      type: boolean
+                    for_expr:
+                      description: Adds the for parameter using the specified log-format expression.
+                      type: string
+                    for_port:
+                      description: Adds the for parameter port using the client port.
+                      type: boolean
+                    for_port_expr:
+                      description: Adds the for parameter port using the specified log-format expression.
+                      type: string
+                    host:
+                      description: Adds the host parameter using the request authority.
+                      type: boolean
+                    host_expr:
+                      description: Adds the host parameter using the specified log-format expression.
+                      type: string
+                    proto:
+                      description: Adds the proto parameter using the incoming request protocol.
+                      type: boolean
+                  required:
+                    - enabled
+                  type: object
                 forwardfor:
                   description: forwardfor
                   properties:
@@ -2957,7 +3017,7 @@ spec:
                     - safe
                   type: string
                 http_send_name_header:
-                  description: http send name header
+                  description: The header string to use to send the server name
                   type: string
                 httpchk_params:
                   description: httpchk params
@@ -3349,7 +3409,7 @@ spec:
                       ServerSwitchingRule Server Switching Rule
 
                       HAProxy server switching rule configuration (corresponds to use-server directive)
-                      Example: {"cond":"if","cond_test":"{ req_ssl_sni -i www.example.com }","target_server":"www"}
+                      Example: {"cond":"if","cond_test":"{ req.ssl_sni -i www.example.com }","target_server":"www"}
 
                       swagger:model server_switching_rule
                     properties:

crs/definition/ingress.v3.haproxy.org_defaults.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    haproxy.org/client-native: v6.2.4
+    haproxy.org/client-native: v6.2.18
   name: defaults.ingress.v3.haproxy.org
 spec:
   group: ingress.v3.haproxy.org
@@ -1338,6 +1338,60 @@ spec:
                   Pattern: ^[^\s]+$
                 pattern: ^[^\s]+$
                 type: string
+              forwarded:
+                description: forwarded
+                properties:
+                  by:
+                    description: Adds the by parameter using the local address.
+                    type: boolean
+                  by_expr:
+                    description: Adds the by parameter using the specified log-format
+                      expression.
+                    type: string
+                  by_port:
+                    description: Adds the by parameter port using the local port.
+                    type: boolean
+                  by_port_expr:
+                    description: Adds the by parameter port using the specified log-format
+                      expression.
+                    type: string
+                  enabled:
+                    description: |-
+                      Enables or disables insertion of the HTTP Forwarded header field.
+                      Required: true
+                      Enum: ["enabled","disabled"]
+                    enum:
+                    - enabled
+                    - disabled
+                    type: string
+                  for:
+                    description: Adds the for parameter using the client address.
+                    type: boolean
+                  for_expr:
+                    description: Adds the for parameter using the specified log-format
+                      expression.
+                    type: string
+                  for_port:
+                    description: Adds the for parameter port using the client port.
+                    type: boolean
+                  for_port_expr:
+                    description: Adds the for parameter port using the specified log-format
+                      expression.
+                    type: string
+                  host:
+                    description: Adds the host parameter using the request authority.
+                    type: boolean
+                  host_expr:
+                    description: Adds the host parameter using the specified log-format
+                      expression.
+                    type: string
+                  proto:
+                    description: Adds the proto parameter using the incoming request
+                      protocol.
+                    type: boolean
+                required:
+                - enabled
+                type: object
               forwardfor:
                 description: forwardfor
                 properties:
@@ -2896,7 +2950,7 @@ spec:
                 - safe
                 type: string
               http_send_name_header:
-                description: http send name header
+                description: Add the server name to a request
                 type: string
               http_use_proxy_header:
                 description: |-
@@ -3127,7 +3181,8 @@ spec:
                 - disabled
                 type: string
               max_keep_alive_queue:
-                description: max keep alive queue
+                description: Maximum server queue size for maintaining keep-alive
+                  connections
                 format: int64
                 type: integer
               maxconn:
@@ -3316,7 +3371,8 @@ spec:
                 format: int64
                 type: integer
               retry_on:
-                description: retry on
+                description: Specify when to attempt to automatically retry a failed
+                  request
                 type: string
               server_fin_timeout:
                 description: |-