MEDIUM: update certificates through runtime

Author: hdurand0710

crs/api/ingress/v1/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=v5.1.11"
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.1.15-0.20241106115115-75c12953fe1f"
 
 // Backend is a specification for a Backend resource
 type Backend struct {

crs/api/ingress/v1/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=v5.1.11"
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.1.15-0.20241106115115-75c12953fe1f"
 
 // Defaults is a specification for a Defaults resource
 type Defaults struct {

crs/api/ingress/v1/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=v5.1.11"
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.1.15-0.20241106115115-75c12953fe1f"
 // +kubebuilder:validation:XValidation:rule="!has(self.spec.config.default_path)", message="spec.config.default_path is set by ingress controller internally"
 // +kubebuilder:validation:XValidation:rule="!has(self.spec.config.master__dash__worker)", message="spec.config.master-worker is set by ingress controller internally"
 // +kubebuilder:validation:XValidation:rule="!has(self.spec.config.pidfile)", message="spec.config.pidfile is set by ingress controller internally"

crs/api/ingress/v1/tcp.go

@@ -23,7 +23,7 @@ import (
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.1.11"
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.1.15-0.20241106115115-75c12953fe1f"
 
 // TCP is a specification for a TCP resource
 type TCP struct {

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

@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-    haproxy.org/client-native: v5.1.11
+    haproxy.org/client-native: v5.1.15-0.20241106115115-75c12953fe1f
   name: backends.ingress.v1.haproxy.org
 spec:
   group: ingress.v1.haproxy.org
@@ -2241,8 +2241,8 @@ spec:
                     capture_sample:
                       description: |-
                         capture sample
-                        Pattern: ^[^\s]+$
-                      pattern: ^[^\s]+$
+                        Pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
+                      pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
                       type: string
                     cond:
                       description: |-
@@ -2488,6 +2488,10 @@ spec:
                       maximum: 599
                       minimum: 200
                       type: integer
+                    rst_ttl:
+                      description: rst ttl
+                      format: int64
+                      type: integer
                     sc_expr:
                       description: sc expr
                       type: string

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

@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-    haproxy.org/client-native: v5.1.11
+    haproxy.org/client-native: v5.1.15-0.20241106115115-75c12953fe1f
   name: defaults.ingress.v1.haproxy.org
 spec:
   group: ingress.v1.haproxy.org

crs/definition/ingress.v1.haproxy.org_globals.yaml

@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-    haproxy.org/client-native: v5.1.11
+    haproxy.org/client-native: v5.1.15-0.20241106115115-75c12953fe1f
   name: globals.ingress.v1.haproxy.org
 spec:
   group: ingress.v1.haproxy.org

crs/definition/ingress.v1.haproxy.org_tcps.yaml

@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-    haproxy.org/client-native: v5.1.11
+    haproxy.org/client-native: v5.1.15-0.20241106115115-75c12953fe1f
   name: tcps.ingress.v1.haproxy.org
 spec:
   group: ingress.v1.haproxy.org
@@ -1613,8 +1613,8 @@ spec:
                           capture_sample:
                             description: |-
                               capture sample
-                              Pattern: ^[^\s]+$
-                            pattern: ^[^\s]+$
+                              Pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
+                            pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
                             type: string
                           cond:
                             description: |-
@@ -1692,6 +1692,10 @@ spec:
                           resolve_var:
                             description: resolve var
                             type: string
+                          rst_ttl:
+                            description: rst ttl
+                            format: int64
+                            type: integer
                           sc_idx:
                             description: sc idx
                             type: string

deploy/tests/e2e/client.go

@@ -239,3 +239,34 @@ func GetGlobalHAProxyInfo() (info GlobalHAProxyInfo, err error) {
 	}
 	return
 }
+
+type CertInfo struct {
+	Used    bool
+	Subject string
+	Issuer  string
+}
+
+func GetCertSubject(filename string) (certInfo CertInfo, err error) {
+	var result []byte
+	result, err = runtimeCommand("show ssl cert " + filename)
+	if err != nil {
+		return
+	}
+	scanner := bufio.NewScanner(bytes.NewReader(result))
+	for scanner.Scan() {
+		line := scanner.Text()
+		switch {
+		case strings.HasPrefix(line, "Used:"):
+			used, convErr := strconv.ParseBool(strings.Split(line, ": ")[1])
+			if convErr != nil {
+				return
+			}
+			certInfo.Used = used
+		case strings.HasPrefix(line, "Subject:"):
+			certInfo.Subject = strings.Split(line, ": ")[1]
+		case strings.HasPrefix(line, "Issuer:"):
+			certInfo.Issuer = strings.Split(line, ": ")[1]
+		}
+	}
+	return
+}

deploy/tests/e2e/crd-tcp/cr_tcp_additional_services_test.go

@@ -20,10 +20,10 @@ import (
 	"strings"
 	"testing"
 
-	parser "github.com/haproxytech/config-parser/v5"
-	"github.com/haproxytech/config-parser/v5/options"
-	"github.com/haproxytech/config-parser/v5/params"
-	"github.com/haproxytech/config-parser/v5/types"
+	parser "github.com/haproxytech/client-native/v5/config-parser"
+	"github.com/haproxytech/client-native/v5/config-parser/options"
+	"github.com/haproxytech/client-native/v5/config-parser/params"
+	"github.com/haproxytech/client-native/v5/config-parser/types"
 	"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
 	"github.com/stretchr/testify/suite"
 )