DOC/MEDIUM: update examples with v3 CRD for TCP CR

Author: hdurand0710

documentation/custom-resource-tcp.md

@@ -30,29 +30,32 @@ The definition can be found [definitions](../crs/definition/)
 Current implementation relies on the client-native library and its models to configure HAProxy.
 
 ```yaml
-apiVersion: ingress.v1.haproxy.org/v1
+apiVersion: ingress.v3.haproxy.org/v3
 kind: TCP
 metadata:
-  name: tcp-1
-  namespace: test
   annotations:
     ingress.class: haproxy
+  name: tcp-1
+  namespace: test
 spec:
-  - name: tcp-http-echo-8443
-    frontend:
-      name: fe-http-echo-8443
-      tcplog: true
-      log_format: "%{+Q}o %t %s"
-      binds:
-        - name: v4
-          port: 32766
-        - name: v4v6
-          address: "::"
-          port: 32766
-          v4v6: true
-    service:
-      name: "http-echo"
-      port: 8443
+- frontend:
+    binds:
+      v4:
+        name: v4
+        port: 32766
+      v4v6:
+        address: '::'
+        name: v4v6
+        port: 32766
+        v4v6: true
+    log_format: '%{+Q}o %t %s'
+    name: fe-http-echo-8443
+    tcplog: true
+  name: tcp-http-echo-8443
+  service:
+    name: http-echo
+    port: 8443
+
 ```
 
 A `TCP` CR contains a list of TCP services definitions.
@@ -233,23 +236,23 @@ For example, by adding the following Backend CR in the `test` namespace:
 <summary>Backend CR</summary>
 
 ```yaml
-apiVersion: ingress.v1.haproxy.org/v1
+apiVersion: ingress.v3.haproxy.org/v3
 kind: Backend
 metadata:
   name: mybackend
   namespace: haproxy-controller
 spec:
-  config:
-    mode: http
-    balance:
-      algorithm: "leastconn"
-    abortonclose: disabled
-    name: toto
-    default_server:
-      verify: none
-      resolve-prefer: ipv4
-      check-sni: example.com
-      sni: str(example.com)
+  abortonclose: disabled
+  balance:
+    algorithm: leastconn
+  default_server:
+    check-sni: example.com
+    resolve-prefer: ipv4
+    sni: str(example.com)
+    verify: none
+  mode: http
+  name: toto
+
 ```
 </details>
 
@@ -279,25 +282,26 @@ In case several TCPs (*accross all namespaces*) have this kind of collisions, we
 
 For example, with using the previous `http-echo` deployement and service, and the already deplyed TCP `tcp-1` in namespace `test`, if we try to deploy the following TCP (that has a collision on Address/Port with the existing TCP `tcp-1`):
 ```yaml
-apiVersion: ingress.v1.haproxy.org/v1
+apiVersion: ingress.v3.haproxy.org/v3
 kind: TCP
 metadata:
-  name: tcp-2
-  namespace: test
   annotations:
     ingress.class: haproxy
+  name: tcp-2
+  namespace: test
 spec:
-  - name: tcp-http-echo-test2-8443
-    frontend:
-      name: fe-http-echo-test2-8443
-      tcplog: true
-      log_format: "%{+Q}o"
-      binds:
-        - name: v4
-          port: 32766
-    service:
-      name: "http-echo"
-      port: 8443
+- frontend:
+    binds:
+      v4:
+        name: v4
+        port: 32766
+    log_format: '%{+Q}o'
+    name: fe-http-echo-test2-8443
+    tcplog: true
+  name: tcp-http-echo-test2-8443
+  service:
+    name: http-echo
+    port: 8443
 ```
 
 
@@ -320,31 +324,33 @@ explaining that :
 To setup SSL in a TCP CR (with the same Service and Pod defined above):
 
 ```yaml
-apiVersion: ingress.v1.haproxy.org/v1
+apiVersion: ingress.v3.haproxy.org/v3
 kind: TCP
 metadata:
-  name: tcp-1
-  namespace: test
   annotations:
     ingress.class: haproxy
+  name: tcp-1
+  namespace: test
 spec:
-  - name: tcp-http-echo-443
-    frontend:
-      name: fe-http-echo-443
-      tcplog: true
-      log_format: "%{+Q}o %t %s"
-      binds:
-        - name: v4
-          ssl: true
-          ssl_certificate: tcp-test-cert
-          port: 32766
-        - name: v4v6
-          address: "::"
-          port: 32766
-          v4v6: true
-    service:
-      name: "http-echo"
-      port: 443
+- frontend:
+    binds:
+      v4:
+        name: v4
+        port: 32766
+        ssl: true
+        ssl_certificate: tcp-test-cert
+      v4v6:
+        address: '::'
+        name: v4v6
+        port: 32766
+        v4v6: true
+    log_format: '%{+Q}o %t %s'
+    name: fe-http-echo-443
+    tcplog: true
+  name: tcp-http-echo-443
+  service:
+    name: http-echo
+    port: 443
 ---
 kind: Secret
 apiVersion: v1

documentation/tcp-cr-full-example/tcp-cr-full.yaml

@@ -1,72 +1,61 @@
-apiVersion: ingress.v1.haproxy.org/v1
+apiVersion: ingress.v3.haproxy.org/v3
 kind: TCP
 metadata:
-  name: tcp-1
   annotations:
     ingress.class: haproxy
+  name: tcp-1
 spec:
-  - name: tcp-test
-    frontend:
-      name: fe-http-echo
-      tcplog: true
-      log_format: "%{+Q}o %t %s"
-      binds:
-        - name: v4
-          address: 0.0.0.0
-          port: 32766
-      acl_list:
-        - acl_name: switch_be_0
-          criterion: req_ssl_sni
-          index: 0
-          value: -i backend0.example.com
-        - acl_name: switch_be_1
-          criterion: req_ssl_sni
-          index: 1
-          value: -i backend1.example.com
-      backend_switching_rule_list:
-        - cond: if
-          cond_test: "switch_be_0"
-          index: 0
-          name: e2e-tests-crd-tcp_svc_http-echo-0_https
-        - cond: if
-          cond_test: "switch_be_1"
-          index: 1
-          name: e2e-tests-crd-tcp_svc_http-echo-1_https
-      capture_list:
-        - index: 0
-          type: request
-          length: 12345
-        - index: 1
-          type: response
-          length: 54321
-      filter_list:
-        - index: 0
-          type: trace
-          trace_name: BEFORE-HTTP-COMP
-        - index: 1
-          type: compression
-        - index: 2
-          type: trace
-          trace_name: AFTER-HTTP-COMP
-      log_target_list:
-        - index: 0
-          facility: daemon
-          address: stdout
-          format: raw
-      tcp_request_rule_list:
-        - type: inspect-delay
-          timeout: 5000
-          index: 0
-        - type: content
-          action: accept
-          cond: if
-          cond_test: "{ req_ssl_hello_type 1 }"
-          index: 1
-    service:
-      name: "http-echo"
-      port: 443
-    services:
-      - name: "http-echo-0"
-        port: 443
-      - name: "http-echo-1"
-        port: 443
+- frontend:
+    acl_list:
+    - acl_name: switch_be_0
+      criterion: req_ssl_sni
+      value: -i backend0.example.com
+    - acl_name: switch_be_1
+      criterion: req_ssl_sni
+      value: -i backend1.example.com
+    backend_switching_rule_list:
+    - cond: if
+      cond_test: switch_be_0
+      name: e2e-tests-crd-tcp_svc_http-echo-0_https
+    - cond: if
+      cond_test: switch_be_1
+      name: e2e-tests-crd-tcp_svc_http-echo-1_https
+    binds:
+      v4:
+        address: 0.0.0.0
+        name: v4
+        port: 32766
+    capture_list:
+    - length: 12345
+      type: request
+    - length: 54321
+      type: response
+    filter_list:
+    - trace_name: BEFORE-HTTP-COMP
+      type: trace
+    - type: compression
+    - trace_name: AFTER-HTTP-COMP
+      type: trace
+    log_format: '%{+Q}o %t %s'
+    log_target_list:
+    - address: stdout
+      facility: daemon
+      format: raw
+    name: fe-http-echo
+    tcp_request_rule_list:
+    - timeout: 5000
+      type: inspect-delay
+    - action: accept
+      cond: if
+      cond_test: '{ req_ssl_hello_type 1 }'
+      type: content
+    tcplog: true
+  name: tcp-test
+  service:
+    name: http-echo
+    port: 443
+  services:
+  - name: http-echo-0
+    port: 443
+  - name: http-echo-1
+    port: 443