NE-2117: Add httpsLogFormat and tcpLogFormat to API

Author: rohara

features.md

@@ -64,6 +64,7 @@
 | GCPCustomAPIEndpointsInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | GCPDualStackInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | GatewayAPIWithoutOLM| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| HTTPSLogFormat| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | HyperShiftOnlyDynamicResourceAllocation| <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |  |
 | ImageModeStatusReporting| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | IngressControllerDynamicConfigurationManager| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |

features/features.go

@@ -1020,4 +1020,12 @@ var (
 				enhancementPR("https://github.com/openshift/enhancements/pull/1910").
 				enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()).
 				mustRegister()
+
+	FeatureGateHTTPSLogFormat = newFeatureGate("HTTPSLogFormat").
+				  reportProblemsToJiraComponent("Networking/router").
+				  contactPerson("rohara").
+		                  productScope(ocpSpecific).
+		                  enhancementPR("https://github.com/openshift/enhancements/pull/1832").
+				  enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()).
+		                  mustRegister()
 )

openapi/generated_openapi/zz_generated.openapi.go

@@ -1495,13 +1495,29 @@ type AccessLogging struct {
 	// +required
 	Destination LoggingDestination `json:"destination"`
 
+	// tcpLogFormat specifies the format of the log message for a TCP
+        // request.
+        //
+        // If this field is empty, log messages use the implementation's default
+        // TCP log format.  For HAProxy's default TCP log format, see the
+	// HAProxy documentation:
+        // http//docs.haproxy.org/2.8/configuration.html#8.2.2
+        //
+        // Note that this format only applies to TCP connections.  It only affects
+        // the log format for TLS passthrough connections.
+        //
+	// +kubebuilder:validation:MinLength=1
+        // +kubebuilder:validation:MaxLength=1024
+        // +optional
+        TcpLogFormat string `json:"tcpLogFormat,omitempty"`
+
 	// httpLogFormat specifies the format of the log message for an HTTP
 	// request.
 	//
 	// If this field is empty, log messages use the implementation's default
 	// HTTP log format.  For HAProxy's default HTTP log format, see the
 	// HAProxy documentation:
-	// http://cbonte.github.io/haproxy-dconv/2.0/configuration.html#8.2.3
+	// http//docs.haproxy.org/2.8/configuration.html#8.2.3
 	//
 	// Note that this format only applies to cleartext HTTP connections
 	// and to secure HTTP connections for which the ingress controller
@@ -1512,6 +1528,24 @@ type AccessLogging struct {
 	// +optional
 	HttpLogFormat string `json:"httpLogFormat,omitempty"`
 
+	// httpsLogFormat specifies the format of the log messsage for an HTTPS
+        // request.
+        //
+        // If this field is empty, log messages use the implementation's default
+        // HTTPS log format.  For HAProxy's default HTTPS log format, see the
+        // HAProxy documentation:
+        // http://docs.haproxy.org/2.8/configuration.html#8.2.4
+        //
+        // Note that this format only applies to HTTPS connections for which the
+        // ingress controller terminates encryption (that is, edge-terminated or
+        // reencrypt connections).  It does not affect the log format for TLS
+        // passthrough connections.
+        //
+	// +kubebuilder:validation:MinLength=1
+	// +kubebuilder:validation:MaxLength=1024
+        // +optional
+        HttpsLogFormat string `json:"httpsLogFormat,omitempty"`
+	
 	// httpCaptureHeaders defines HTTP headers that should be captured in
 	// access logs.  If this field is empty, no headers are captured.
 	//